June 2019 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Accept case variations for path properties.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 48f93bc3290596b8da4455496fa88cd13ea6f3c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48f93bc3290596b8da445549… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 19 11:04:13 2019 +0200 msi/tests: Accept case variations for path properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 65 +++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 7915798..4d384d0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -2146,14 +2146,17 @@ static void test_condition(void) DeleteFileA(msifile); } -static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect) +static void check_prop(MSIHANDLE hpkg, const char *prop, const char *expect, int match_case) { char buffer[MAX_PATH] = "x"; DWORD sz = sizeof(buffer); UINT r = MsiGetPropertyA(hpkg, prop, buffer, &sz); ok(!r, "'%s': got %u\n", prop, r); ok(sz == lstrlenA(buffer), "'%s': expected %u, got %u\n", prop, lstrlenA(buffer), sz); - ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); + if (match_case) + ok(!strcmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); + else + ok(!_stricmp(buffer, expect), "'%s': expected '%s', got '%s'\n", prop, expect, buffer); } static void test_props(void) @@ -2229,29 +2232,29 @@ static void test_props(void) r = MsiSetPropertyA( hpkg, "=", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "=", "asdf"); + check_prop(hpkg, "=", "asdf", 1); r = MsiSetPropertyA( hpkg, " ", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, " ", "asdf"); + check_prop(hpkg, " ", "asdf", 1); r = MsiSetPropertyA( hpkg, "'", "asdf" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "'", "asdf"); + check_prop(hpkg, "'", "asdf", 1); /* set empty values */ r = MsiSetPropertyA( hpkg, "boo", NULL ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", ""); + check_prop(hpkg, "boo", "", 1); r = MsiSetPropertyA( hpkg, "boo", "" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", ""); + check_prop(hpkg, "boo", "", 1); /* set a non-empty value */ r = MsiSetPropertyA( hpkg, "boo", "xyz" ); ok(!r, "got %u\n", r); - check_prop(hpkg, "boo", "xyz"); + check_prop(hpkg, "boo", "xyz", 1); r = MsiGetPropertyA(hpkg, "boo", NULL, NULL); ok(!r, "got %u\n", r); @@ -2326,10 +2329,10 @@ static void test_props(void) ok(sz == 3, "got size %u\n", sz); /* properties are case-sensitive */ - check_prop(hpkg, "BOO", ""); + check_prop(hpkg, "BOO", "", 1); /* properties set in Property table should work */ - check_prop(hpkg, "MetadataCompName", "Photoshop.dll"); + check_prop(hpkg, "MetadataCompName", "Photoshop.dll", 1); MsiCloseHandle( hpkg ); DeleteFileA(msifile); @@ -5739,65 +5742,65 @@ static void test_installprops(void) if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) { sprintf(buf, "%d", si.wProcessorLevel); - check_prop(hpkg, "Intel", buf); - check_prop(hpkg, "MsiAMD64", buf); - check_prop(hpkg, "Msix64", buf); + check_prop(hpkg, "Intel", buf, 1); + check_prop(hpkg, "MsiAMD64", buf, 1); + check_prop(hpkg, "Msix64", buf, 1); sprintf(buf, "%d", LOBYTE(LOWORD(GetVersion())) * 100 + HIBYTE(LOWORD(GetVersion()))); - check_prop(hpkg, "VersionNT64", buf); + check_prop(hpkg, "VersionNT64", buf, 1); GetSystemDirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "System64Folder", path); + check_prop(hpkg, "System64Folder", path, 0); GetSystemWow64DirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "SystemFolder", path); + check_prop(hpkg, "SystemFolder", path, 0); size = MAX_PATH; r = RegQueryValueExA(pathkey, "ProgramFilesDir (x86)", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFilesFolder", path); + check_prop(hpkg, "ProgramFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFiles64Folder", path); + check_prop(hpkg, "ProgramFiles64Folder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir (x86)", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFilesFolder", path); + check_prop(hpkg, "CommonFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFiles64Folder", path); + check_prop(hpkg, "CommonFiles64Folder", path, 0); } else if (S(U(si)).wProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { sprintf(buf, "%d", si.wProcessorLevel); - check_prop(hpkg, "Intel", buf); + check_prop(hpkg, "Intel", buf, 1); GetSystemDirectoryA(path, MAX_PATH); strcat(path, "\\"); - check_prop(hpkg, "SystemFolder", path); + check_prop(hpkg, "SystemFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "ProgramFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "ProgramFilesFolder", path); + check_prop(hpkg, "ProgramFilesFolder", path, 0); size = MAX_PATH; RegQueryValueExA(pathkey, "CommonFilesDir", 0, &type, (BYTE *)path, &size); strcat(path, "\\"); - check_prop(hpkg, "CommonFilesFolder", path); - - check_prop(hpkg, "MsiAMD64", ""); - check_prop(hpkg, "Msix64", ""); - check_prop(hpkg, "VersionNT64", ""); - check_prop(hpkg, "System64Folder", ""); - check_prop(hpkg, "ProgramFiles64Dir", ""); - check_prop(hpkg, "CommonFiles64Dir", ""); + check_prop(hpkg, "CommonFilesFolder", path, 0); + + check_prop(hpkg, "MsiAMD64", "", 1); + check_prop(hpkg, "Msix64", "", 1); + check_prop(hpkg, "VersionNT64", "", 1); + check_prop(hpkg, "System64Folder", "", 0); + check_prop(hpkg, "ProgramFiles64Dir", "", 0); + check_prop(hpkg, "CommonFiles64Dir", "", 0); } CloseHandle(hkey1);

1 0

Dmitry Timoshkov : mshtml: Add support for DIID_HTMLDocumentEvents2 connection point sink.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: ec29d40e4e863c9b73dcc33ee0af789a6d8476ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec29d40e4e863c9b73dcc33e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 19 22:54:17 2019 +0800 mshtml: Add support for DIID_HTMLDocumentEvents2 connection point sink. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 3 ++- dlls/mshtml/htmlevent.c | 2 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/events.c | 58 +++++++++++++++++++++++++++++++++++++------- 4 files changed, 54 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 54787f0..af99d64 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5216,12 +5216,13 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) } static cp_static_data_t HTMLDocumentEvents_data = { HTMLDocumentEvents_tid, HTMLDocument_on_advise }; +static cp_static_data_t HTMLDocumentEvents2_data = { HTMLDocumentEvents2_tid, HTMLDocument_on_advise, TRUE }; static const cpc_entry_t HTMLDocument_cpc[] = { {&IID_IDispatch, &HTMLDocumentEvents_data}, {&IID_IPropertyNotifySink}, {&DIID_HTMLDocumentEvents, &HTMLDocumentEvents_data}, - {&DIID_HTMLDocumentEvents2}, + {&DIID_HTMLDocumentEvents2, &HTMLDocumentEvents2_data}, {NULL} }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index b090d1c..4cf9945 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2412,6 +2412,8 @@ static HRESULT call_cp_func(IDispatch *disp, DISPID dispid, IHTMLEventObj *event ULONG argerr; EXCEPINFO ei; + TRACE("%p,%d,%p,%p\n", disp, dispid, event_obj, retv); + if(event_obj) { V_VT(&event_arg) = VT_DISPATCH; V_DISPATCH(&event_arg) = (IDispatch*)event_obj; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a36da94..6bfce89 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -136,6 +136,7 @@ typedef struct EventTarget EventTarget; XDIID(DispSVGSVGElement) \ XDIID(DispSVGTSpanElement) \ XDIID(HTMLDocumentEvents) \ + XDIID(HTMLDocumentEvents2) \ XDIID(HTMLElementEvents2) \ XIID(IDOMCustomEvent) \ XIID(IDOMEvent) \ diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index f9bf88e..4ef58df 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -66,6 +66,7 @@ DEFINE_EXPECT(div_onclick_capture); DEFINE_EXPECT(div_onclick_bubble); DEFINE_EXPECT(timeout); DEFINE_EXPECT(doccp_onclick); +DEFINE_EXPECT(doccp2_onclick); DEFINE_EXPECT(doccp_onclick_cancel); DEFINE_EXPECT(div_onclick_disp); DEFINE_EXPECT(invoke_onclick); @@ -1440,14 +1441,28 @@ EVENT_HANDLER_FUNC_OBJ(nocall); }; \ static IDispatchEx cpname ## _obj = { &cpname ## Vtbl } -#define test_cp_args(a,b,c,d,e,f) _test_cp_args(__LINE__,a,b,c,d,e,f) -static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr) +#define test_cp_args(a,b,c,d,e,f,g) _test_cp_args(__LINE__,a,b,c,d,e,f,g) +static void _test_cp_args(unsigned line, REFIID riid, WORD flags, DISPPARAMS *dp, VARIANT *vres, EXCEPINFO *ei, UINT *argerr, BOOL use_events2) { ok_(__FILE__,line)(IsEqualGUID(&IID_NULL, riid), "riid = %s\n", wine_dbgstr_guid(riid)); ok_(__FILE__,line)(flags == DISPATCH_METHOD, "flags = %x\n", flags); ok_(__FILE__,line)(dp != NULL, "dp == NULL\n"); - ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); - ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + if (use_events2) + { + IHTMLEventObj *event; + HRESULT hr; + ok_(__FILE__,line)(dp->cArgs == 1, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(dp->rgvarg != NULL, "dp->rgvarg = %p\n", dp->rgvarg); + ok_(__FILE__,line)(V_VT(&dp->rgvarg[0]) == VT_DISPATCH, "vt = %d\n", V_VT(&dp->rgvarg[0])); + hr = IDispatch_QueryInterface(V_DISPATCH(&dp->rgvarg[0]), &IID_IHTMLEventObj, (void **)&event); + ok_(__FILE__,line)(hr == S_OK, "Could not get IHTMLEventObj iface: %08x\n", hr); + IHTMLEventObj_Release(event); + } + else + { + ok_(__FILE__,line)(!dp->cArgs, "dp->cArgs = %d\n", dp->cArgs); + ok_(__FILE__,line)(!dp->rgvarg, "dp->rgvarg = %p\n", dp->rgvarg); + } ok_(__FILE__,line)(!dp->cNamedArgs, "dp->cNamedArgs = %d\n", dp->cNamedArgs); ok_(__FILE__,line)(!dp->rgdispidNamedArgs, "dp->rgdispidNamedArgs = %p\n", dp->rgdispidNamedArgs); ok_(__FILE__,line)(vres != NULL, "vres == NULL\n"); @@ -1489,7 +1504,7 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, switch(dispIdMember) { case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: CHECK_EXPECT(doccp_onclick); - test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, FALSE); break; default: ok(0, "unexpected call %d\n", dispIdMember); @@ -1501,13 +1516,32 @@ static HRESULT WINAPI doccp(IDispatchEx *iface, DISPID dispIdMember, CONNECTION_POINT_OBJ(doccp, DIID_HTMLDocumentEvents); +static HRESULT WINAPI doccp2(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) +{ + switch(dispIdMember) { + case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: + CHECK_EXPECT(doccp2_onclick); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, TRUE); + break; + default: + ok(0, "unexpected call %d\n", dispIdMember); + return E_NOTIMPL; + } + + return S_OK; +} + +CONNECTION_POINT_OBJ(doccp2, DIID_HTMLDocumentEvents2); + static HRESULT WINAPI doccp_onclick_cancel(IDispatchEx *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, EXCEPINFO *pei, UINT *puArgErr) { switch(dispIdMember) { case DISPID_HTMLDOCUMENTEVENTS_ONCLICK: CHECK_EXPECT(doccp_onclick_cancel); - test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr); + test_cp_args(riid, wFlags, pdp, pVarResult, pei, puArgErr, FALSE); V_VT(pVarResult) = VT_BOOL; V_BOOL(pVarResult) = VARIANT_FALSE; break; @@ -1788,7 +1822,7 @@ static void set_body_html(IHTMLDocument2 *doc, const char *html) static void test_onclick(IHTMLDocument2 *doc) { - DWORD cp_cookie, elem2_cp_cookie; + DWORD events_cp_cookie, events2_cp_cookie, elem2_cp_cookie; IHTMLElement *div, *body; VARIANT v; HRESULT hres; @@ -1936,7 +1970,8 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(invoke_onclick); - cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + events_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, (IUnknown*)&doccp_obj); + events2_cp_cookie = register_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, (IUnknown*)&doccp2_obj); elem_attach_event((IUnknown*)div, "onclick", (IDispatch*)&div_onclick_disp); doc_attach_event(doc, "onclick", (IDispatch*)&doc_onclick_attached_obj); @@ -1951,6 +1986,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); + SET_EXPECT(doccp2_onclick); SET_EXPECT(invoke_onclick); hres = IHTMLElement_click(div); @@ -1967,6 +2003,7 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); + CHECK_CALLED(doccp2_onclick); CHECK_CALLED(invoke_onclick); elem2_cp_cookie = register_cp((IUnknown*)div, &DIID_HTMLElementEvents2, (IUnknown*)&elem2_cp_obj); @@ -1983,6 +2020,7 @@ static void test_onclick(IHTMLDocument2 *doc) SET_EXPECT(document_onclick); SET_EXPECT(doc_onclick_attached); SET_EXPECT(doccp_onclick); + SET_EXPECT(doccp2_onclick); SET_EXPECT(invoke_onclick); trace("click >>>\n"); @@ -2002,10 +2040,12 @@ static void test_onclick(IHTMLDocument2 *doc) CHECK_CALLED(document_onclick); CHECK_CALLED(doc_onclick_attached); CHECK_CALLED(doccp_onclick); + CHECK_CALLED(doccp2_onclick); CHECK_CALLED(invoke_onclick); unregister_cp((IUnknown*)div, &DIID_HTMLElementEvents2, elem2_cp_cookie); - unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, cp_cookie); + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents, events_cp_cookie); + unregister_cp((IUnknown*)doc, &DIID_HTMLDocumentEvents2, events2_cp_cookie); V_VT(&v) = VT_NULL; hres = IHTMLElement_put_onclick(div, v);

1 0

Zhiyi Zhang : dxgi: Implement Alt+Enter handling.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: a600760fa1ae206e10e4ea56bb13df672ec026d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a600760fa1ae206e10e4ea56… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:04 2019 +0430 dxgi: Implement Alt+Enter handling. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 16 ++- dlls/dxgi/tests/dxgi.c | 9 +- dlls/dxgi/utils.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/swapchain.c | 4 + dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_main.c | 293 +++++++++++++++++++++++++++++++++++------ dlls/wined3d/wined3d_private.h | 3 +- include/wine/wined3d.h | 8 ++ 9 files changed, 291 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a600760fa1ae206e10e4…

1 0

Zhiyi Zhang : dxgi/tests: Add window association tests.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 434b6fe019ec1ccab76f40a32bde6f96b6ea274b URL: https://source.winehq.org/git/wine.git/?a=commit;h=434b6fe019ec1ccab76f40a3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:00 2019 +0430 dxgi/tests: Add window association tests. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0..d123e40 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4985,6 +4985,185 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + LONG_PTR original_wndproc, wndproc; + IDXGIFactory *factory, *factory2; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIDevice *device; + HWND hwnd, hwnd2; + BOOL fullscreen; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here: + * + * - Posting them to the window doesn't exit fullscreen like + * Alt+Enter does. Alt+Tab and Alt+Esc are handled somewhere else. + * E.g., not calling IDXGISwapChain::Present() will break Alt+Tab + * and Alt+Esc while Alt+Enter will still function. + * + * - Posting them hangs the posting thread. Another thread that keeps + * sending input is needed to avoid the hang. The hang is not + * because of flush_events(). */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + original_wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGIAdapter_Release(adapter); + + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i <= DXGI_MWA_VALID; ++i) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx for flags %#x.\n", + wndproc, original_wndproc, i); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + /* Apparently GetWindowAssociation() always returns NULL, even when + * MakeWindowAssociation() and GetWindowAssociation() are both + * successfully called. */ + todo_wine ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Alt+Enter tests. */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Got unexpected wndproc %#lx, expected %#lx.\n", wndproc, original_wndproc); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Windows 7 testbot */, + "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not change fullscreen state.\n"); + } + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + /* First associate a window with the opposite flags. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associate the current test window. */ + hwnd = tests[i].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[i].flag); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associating a new test window doesn't override the old window. */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Associations with a different factory don't affect the existing + * association. */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, ~tests[i].flag & DXGI_MWA_VALID); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN. */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(tests[i].expect_fullscreen) + ok(fullscreen == tests[i].expect_fullscreen + || broken(tests[i].broken_d3d10 && fullscreen), + "Test %u: Got unexpected fullscreen %#x.\n", i, fullscreen); + + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + ok(wndproc == original_wndproc, "Text %u: Got unexpected wndproc %#lx, expected %#lx.\n", + i, wndproc, original_wndproc); + } + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5084,6 +5263,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index);

1 0

Alexandre Julliard : rtutils: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 966b57c2ed6729ac80a55e697aed84e43efad9ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=966b57c2ed6729ac80a55e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:41 2019 +0200 rtutils: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rtutils/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index fb49dfc..d778852 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,6 +1,8 @@ MODULE = rtutils.dll IMPORTLIB = rtutils +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c \ tracing.c

1 0

Zhiyi Zhang : dxgi: Implement dxgi_factory_GetWindowAssociation().
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 6c3c5b23c76dc8df8ea662e2de38c90ddc1607dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c3c5b23c76dc8df8ea662e2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 19 14:59:01 2019 +0430 dxgi: Implement dxgi_factory_GetWindowAssociation(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 10 ++++++++-- dlls/dxgi/tests/dxgi.c | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145b..6912fc1 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -181,9 +181,15 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFac static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + return DXGI_ERROR_INVALID_CALL; + + /* The tests show that this always returns NULL for some unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index d123e40..c5e5006 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5064,7 +5064,7 @@ static void test_window_association(void) refcount = IDXGIAdapter_Release(adapter); hr = IDXGIFactory_GetWindowAssociation(factory, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); for (i = 0; i <= DXGI_MWA_VALID; ++i) { @@ -5080,11 +5080,11 @@ static void test_window_association(void) hwnd = (HWND)0xdeadbeef; hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); + ok(hr == S_OK, "Got unexpected hr %#x for flags %#x.\n", hr, i); /* Apparently GetWindowAssociation() always returns NULL, even when * MakeWindowAssociation() and GetWindowAssociation() are both * successfully called. */ - todo_wine ok(!hwnd, "Expect null associated window.\n"); + ok(!hwnd, "Expect null associated window.\n"); } hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1);

1 0

Alexandre Julliard : rsaenh: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 18fbc3a3cf880f35ab497c0e2026fe850536c6bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=18fbc3a3cf880f35ab497c0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:32:27 2019 +0200 rsaenh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/Makefile.in | 2 ++ dlls/rsaenh/implglue.c | 9 +++------ dlls/rsaenh/rsaenh.c | 6 +----- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 9997752..80680d6 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -2,6 +2,8 @@ MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = bcrypt crypt32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ aes.c \ des.c \ diff --git a/dlls/rsaenh/implglue.c b/dlls/rsaenh/implglue.c index 76c2b1f..9d90ad7 100644 --- a/dlls/rsaenh/implglue.c +++ b/dlls/rsaenh/implglue.c @@ -21,18 +21,15 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - -#include "wine/port.h" -#include "wine/library.h" +#include <stdarg.h> +#include <stdio.h> #include "windef.h" +#include "winbase.h" #include "wincrypt.h" #include "implglue.h" -#include <stdio.h> - /* Function prototype copied from dlls/advapi32/crypt.c */ BOOL WINAPI SystemFunction036(PVOID pbBuffer, ULONG dwLen); diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index c22b3dc..9119d4b 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -22,11 +22,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" -#include "wine/library.h" -#include "wine/debug.h" - #include <stdarg.h> #include <stdio.h> @@ -39,6 +34,7 @@ #include "objbase.h" #include "rpcproxy.h" #include "aclapi.h" +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt);

1 0

Alexandre Julliard : rasapi32: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 6ce8c4327ee89d798556ce384a7c4afaf8e0a73d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ce8c4327ee89d798556ce38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:29:08 2019 +0200 rasapi32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rasapi32/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index ff7e710..2bb4762 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,6 @@ MODULE = rasapi32.dll IMPORTLIB = rasapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = rasapi.c

1 0

Alexandre Julliard : qmgr: Build with msvcrt.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: d6d38f157a459765344b7e1cf13a77960cef73ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6d38f157a459765344b7e1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 10:28:11 2019 +0200 qmgr: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qmgr/Makefile.in | 2 ++ dlls/qmgr/file.c | 2 +- dlls/qmgr/job.c | 4 ++-- dlls/qmgr/qmgr.h | 13 ++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 7c23e84..fe051ad 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -1,6 +1,8 @@ MODULE = qmgr.dll IMPORTS = uuid winhttp ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ enum_files.c \ enum_jobs.c \ diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index e717dc8..6621b23 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -459,7 +459,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); - if (strlenW(file->info.RemoteName) > 7 && !strncmpiW(file->info.RemoteName, fileW, 7)) + if (lstrlenW(file->info.RemoteName) > 7 && !wcsnicmp(file->info.RemoteName, fileW, 7)) ptr = file->info.RemoteName + 7; else ptr = file->info.RemoteName; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index a12e511..0eef336 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -599,7 +599,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription( if (!Val) return E_INVALIDARG; - len = strlenW(Val); + len = lstrlenW(Val); if (len > max_description_len) return BG_E_STRING_TOO_LONG; EnterCriticalSection(&This->cs); @@ -612,7 +612,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetDescription( { HeapFree(GetProcessHeap(), 0, This->description); if ((This->description = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)))) - strcpyW(This->description, Val); + lstrcpyW(This->description, Val); else hr = E_OUTOFMEMORY; } diff --git a/dlls/qmgr/qmgr.h b/dlls/qmgr/qmgr.h index 2bc5b8b..87f8307 100644 --- a/dlls/qmgr/qmgr.h +++ b/dlls/qmgr/qmgr.h @@ -31,7 +31,6 @@ #include <string.h> #include "wine/list.h" -#include "wine/unicode.h" /* Background copy job vtbl and related data */ typedef struct @@ -118,15 +117,15 @@ BOOL transitionJobState(BackgroundCopyJobImpl *job, BG_JOB_STATE from, BG_JOB_ST /* Little helper functions */ static inline WCHAR *strdupW(const WCHAR *src) { - WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (strlenW(src) + 1) * sizeof(WCHAR)); - if (dst) strcpyW(dst, src); + WCHAR *dst = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dst) lstrcpyW(dst, src); return dst; } static inline WCHAR *co_strdupW(const WCHAR *src) { - WCHAR *dst = CoTaskMemAlloc((strlenW(src) + 1) * sizeof(WCHAR)); - if (dst) strcpyW(dst, src); + WCHAR *dst = CoTaskMemAlloc((lstrlenW(src) + 1) * sizeof(WCHAR)); + if (dst) lstrcpyW(dst, src); return dst; } @@ -136,10 +135,10 @@ static inline HRESULT return_strval(const WCHAR *str, WCHAR **ret) if (!ret) return E_INVALIDARG; - len = strlenW(str); + len = lstrlenW(str); *ret = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); if (!*ret) return E_OUTOFMEMORY; - strcpyW(*ret, str); + lstrcpyW(*ret, str); return S_OK; }

1 0

Zebediah Figura : wineqtdecoder/qtsplitter: Share source pin and filter reference counts.
by Alexandre Julliard June 19, 2019

June 19, 2019

Module: wine Branch: master Commit: 9ee197f2f61e6edf660b199cd02748fe412c0f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ee197f2f61e6edf660b199c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 18 20:17:33 2019 -0500 wineqtdecoder/qtsplitter: Share source pin and filter reference counts. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 60 ++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 37 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 8a88729..8298406 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -779,23 +779,22 @@ static const IBaseFilterVtbl QT_Vtbl = { BaseFilterImpl_QueryVendorInfo }; -static HRESULT break_source_connection(BaseOutputPin *pin) +static void free_source_pin(QTOutPin *pin) { - HRESULT hr; - - EnterCriticalSection(pin->pin.pCritSec); - if (!pin->pin.pConnectedTo || !pin->pMemInputPin) - hr = VFW_E_NOT_CONNECTED; - else + EnterCriticalSection(pin->pin.pin.pCritSec); + if (pin->pin.pin.pConnectedTo) { - hr = IMemAllocator_Decommit(pin->pAllocator); - if (SUCCEEDED(hr)) - hr = IPin_Disconnect(pin->pin.pConnectedTo); - IPin_Disconnect(&pin->pin.IPin_iface); + if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) + IPin_Disconnect(pin->pin.pin.pConnectedTo); + IPin_Disconnect(&pin->pin.pin.IPin_iface); } - LeaveCriticalSection(pin->pin.pCritSec); + LeaveCriticalSection(pin->pin.pin.pCritSec); - return hr; + DeleteMediaType(pin->pmt); + FreeMediaType(&pin->pin.pin.mtCurrent); + if (pin->pin.pAllocator) + IMemAllocator_Release(pin->pin.pAllocator); + CoTaskMemFree(pin); } /* @@ -803,23 +802,16 @@ static HRESULT break_source_connection(BaseOutputPin *pin) */ static HRESULT QT_RemoveOutputPins(QTSplitter *This) { - HRESULT hr; - TRACE("(%p)\n", This); - if (This->pVideo_Pin) { OutputQueue_Destroy(This->pVideo_Pin->queue); - hr = break_source_connection(&This->pVideo_Pin->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->pVideo_Pin->pin.pin.IPin_iface); + free_source_pin(This->pVideo_Pin); This->pVideo_Pin = NULL; } if (This->pAudio_Pin) { OutputQueue_Destroy(This->pAudio_Pin->queue); - hr = break_source_connection(&This->pAudio_Pin->pin); - TRACE("Disconnect: %08x\n", hr); - IPin_Release(&This->pAudio_Pin->pin.pin.IPin_iface); + free_source_pin(This->pAudio_Pin); This->pAudio_Pin = NULL; } @@ -1340,22 +1332,16 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p return E_NOINTERFACE; } -static ULONG WINAPI QTOutPin_Release(IPin *iface) +static ULONG WINAPI QTOutPin_AddRef(IPin *iface) { - QTOutPin *This = impl_QTOutPin_from_IPin(iface); - ULONG refCount = InterlockedDecrement(&This->pin.pin.refCount); - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); + QTOutPin *pin = impl_QTOutPin_from_IPin(iface); + return IBaseFilter_AddRef(pin->pin.pin.pinInfo.pFilter); +} - if (!refCount) - { - DeleteMediaType(This->pmt); - FreeMediaType(&This->pin.pin.mtCurrent); - if (This->pin.pAllocator) - IMemAllocator_Release(This->pin.pAllocator); - CoTaskMemFree(This); - return 0; - } - return refCount; +static ULONG WINAPI QTOutPin_Release(IPin *iface) +{ + QTOutPin *pin = impl_QTOutPin_from_IPin(iface); + return IBaseFilter_Release(pin->pin.pin.pinInfo.pFilter); } static HRESULT WINAPI QTOutPin_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE *amt) @@ -1406,7 +1392,7 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(BaseOutputPin *iface, IMemInputPi static const IPinVtbl QT_OutputPin_Vtbl = { QTOutPin_QueryInterface, - BasePinImpl_AddRef, + QTOutPin_AddRef, QTOutPin_Release, BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection,

1 0