July 2014 - Wine-Commits - list.winehq.org

Gerald Pfeifer : winhttp: Remove unused constant proxymsg.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 25bf35243e866644e77ae363f5b13597513ab69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=25bf35243e866644e77ae363f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jul 25 23:32:00 2014 +0200 winhttp: Remove unused constant proxymsg. --- dlls/winhttp/tests/winhttp.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 6a2d8c6..f214879 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1774,13 +1774,6 @@ static const char noauthmsg[] = "WWW-Authenticate: Basic realm=\"placebo\"\r\n" "\r\n"; -static const char proxymsg[] = -"HTTP/1.1 407 Proxy Authentication Required\r\n" -"Server: winetest\r\n" -"Proxy-Connection: close\r\n" -"Proxy-Authenticate: Basic realm=\"placebo\"\r\n" -"\r\n"; - struct server_info { HANDLE event;

1 0

Thomas Faber : dsound: Do not call CoUninitialize if CoInitialize failed.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 78b96c8776e05b6becd574cf9a44178bd2cb2388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b96c8776e05b6becd574cf9… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 12:41:23 2014 +0200 dsound: Do not call CoUninitialize if CoInitialize failed. --- dlls/dsound/dsound_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 7a16366..0e3a313 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -178,7 +178,8 @@ static HRESULT get_mmdevenum(IMMDeviceEnumerator **devenum) hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)devenum); if(FAILED(hr)){ - CoUninitialize(); + if(SUCCEEDED(init_hr)) + CoUninitialize(); *devenum = NULL; ERR("CoCreateInstance failed: %08x\n", hr); return hr;

1 0

Thomas Faber : amstream: Destroy BaseFilter after MediaStreamFilterImpl child class.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: cc45c1373c493eca4cea535119ccfd50a1442e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc45c1373c493eca4cea53511… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Jul 22 15:19:44 2014 +0200 amstream: Destroy BaseFilter after MediaStreamFilterImpl child class. --- dlls/amstream/mediastreamfilter.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 8811455..8c26c8e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -238,7 +238,7 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -250,6 +250,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) IMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } + BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); }

1 0

Bruno Jesus : rsaenh: Detect AES prototype provider correctly.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: d2793fe242ac65b4e41cc11e8012e6e6379831f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2793fe242ac65b4e41cc11e8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 17:41:58 2014 -0300 rsaenh: Detect AES prototype provider correctly. --- dlls/rsaenh/rsaenh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index b4829f0..3ad28f9 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -1286,7 +1286,8 @@ static HCRYPTPROV new_key_container(PCCH pszContainerName, DWORD dwFlags, const pKeyContainer->dwPersonality = RSAENH_PERSONALITY_ENHANCED; } else if (!strcmp(pVTable->pszProvName, MS_DEF_RSA_SCHANNEL_PROV_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_SCHANNEL; - } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A)) { + } else if (!strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_A) || + !strcmp(pVTable->pszProvName, MS_ENH_RSA_AES_PROV_XP_A)) { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_AES; } else { pKeyContainer->dwPersonality = RSAENH_PERSONALITY_STRONG;

1 0

Thomas Faber : qcap: Destroy BaseOutputPin in VfwPin_Release.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: f0200b6d25c98b338b5814dec6eb4c9df5412982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0200b6d25c98b338b5814dec… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 01:34:55 2014 +0200 qcap: Destroy BaseOutputPin in VfwPin_Release. --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 2cbf493..2551534 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -779,7 +779,7 @@ VfwPin_Release(IPin * iface) if (!refCount) { - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); ObjectRefCount(FALSE); } return refCount;

1 0

Thomas Faber : quartz/tests: Fix memory leaks.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: cf45bec65b6ae1db6f4f96cf44eaa7f98026a9a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45bec65b6ae1db6f4f96cf4… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 23:52:29 2014 +0200 quartz/tests: Fix memory leaks. --- dlls/quartz/tests/filtergraph.c | 1 + dlls/quartz/tests/referenceclock.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 713df7b..2f56151 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -1884,6 +1884,7 @@ START_TEST(filtergraph) skip("Creating filtergraph returned %08x, skipping tests\n", hr); return; } + IGraphBuilder_Release(pgraph); test_render_run(avifile); test_render_run(mpegfile); test_graph_builder(); diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index a96bd48..eb6fbda 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -28,19 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - IUnknown *pF; + void *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (LPVOID *)&pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); + if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); } /* The following method expects a reference clock that will keep ticking for

1 0

Thomas Faber : quartz: Avoid side-effects in asserts.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: bab08e690ee7b11bd3e0aee5e4de247d30348d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab08e690ee7b11bd3e0aee5e… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Jul 26 22:04:29 2014 +0200 quartz: Avoid side-effects in asserts. --- dlls/quartz/avisplit.c | 22 +++++++++++++++++----- dlls/quartz/parser.c | 7 +++++-- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index d74c8ab..1f57045 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -151,6 +151,7 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe PullPin *pin = This->Parser.pInputPin; IMediaSample *sample = NULL; HRESULT hr; + ULONG ref; TRACE("(%p, %u)->()\n", This, streamnumber); @@ -264,7 +265,10 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe hr = IAsyncReader_Request(pin->pReader, sample, streamnumber); if (FAILED(hr)) - assert(IMediaSample_Release(sample) == 0); + { + ref = IMediaSample_Release(sample); + assert(ref == 0); + } } else { @@ -278,7 +282,8 @@ static HRESULT AVISplitter_next_request(AVISplitterImpl *This, DWORD streamnumbe if (sample) { ERR("There should be no sample!\n"); - assert(IMediaSample_Release(sample) == 0); + ref = IMediaSample_Release(sample); + assert(ref == 0); } } TRACE("--> %08x\n", hr); @@ -510,8 +515,8 @@ static HRESULT AVISplitter_first_request(LPVOID iface) static HRESULT AVISplitter_done_process(LPVOID iface) { AVISplitterImpl *This = iface; - DWORD x; + ULONG ref; for (x = 0; x < This->Parser.cStreams; ++x) { @@ -525,7 +530,10 @@ static HRESULT AVISplitter_done_process(LPVOID iface) stream->thread = NULL; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); @@ -1219,6 +1227,7 @@ static HRESULT AVISplitter_Flush(LPVOID iface) { AVISplitterImpl *This = iface; DWORD x; + ULONG ref; TRACE("(%p)->()\n", This); @@ -1227,7 +1236,10 @@ static HRESULT AVISplitter_Flush(LPVOID iface) StreamData *stream = This->streams + x; if (stream->sample) - assert(IMediaSample_Release(stream->sample) == 0); + { + ref = IMediaSample_Release(stream->sample); + assert(ref == 0); + } stream->sample = NULL; ResetEvent(stream->packet_queued); diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index b57bae4..cd8d93d 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -170,6 +170,7 @@ void Parser_Destroy(ParserImpl *This) { IPin *connected = NULL; ULONG pinref; + HRESULT hr; assert(!This->filter.refCount); PullPin_WaitForStateChange(This->pInputPin, INFINITE); @@ -178,9 +179,11 @@ void Parser_Destroy(ParserImpl *This) IPin_ConnectedTo(&This->pInputPin->pin.IPin_iface, &connected); if (connected) { - assert(IPin_Disconnect(connected) == S_OK); + hr = IPin_Disconnect(connected); + assert(hr == S_OK); IPin_Release(connected); - assert(IPin_Disconnect(&This->pInputPin->pin.IPin_iface) == S_OK); + hr = IPin_Disconnect(&This->pInputPin->pin.IPin_iface); + assert(hr == S_OK); } pinref = IPin_Release(&This->pInputPin->pin.IPin_iface); if (pinref)

1 0

Bruno Jesus : dmime/tests: Fix a crash in Windows 2000.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 147bf5bd6f3c5f96ad8725ebfbba23fcfe406fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=147bf5bd6f3c5f96ad8725ebf… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sat Jul 26 23:31:42 2014 -0300 dmime/tests: Fix a crash in Windows 2000. --- dlls/dmime/tests/dmime.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 1258d40..03b0a37 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -380,6 +380,10 @@ static void test_audiopathconfig(void) hr = CoCreateInstance(&CLSID_DirectMusicAudioPathConfig, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicObject, (void**)&dmo); + if (hr == REGDB_E_CLASSNOTREG) { + win_skip("DirectMusicAudioPathConfig not registered\n"); + return; + } ok(hr == S_OK, "DirectMusicAudioPathConfig create failed: %08x, expected S_OK\n", hr); /* IPersistStream */

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::navigate implementation.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: be2128fd059ec1e1786c70fda347d6ce37de2cd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be2128fd059ec1e1786c70fda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 28 23:56:43 2014 +0200 mshtml: Added IHTMLWindow2::navigate implementation. --- dlls/mshtml/htmlwindow.c | 6 ++++-- dlls/mshtml/tests/nav_test.html | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index fab227e..bc648f3 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1010,8 +1010,10 @@ static HRESULT WINAPI HTMLWindow2_get_window(IHTMLWindow2 *iface, IHTMLWindow2 * static HRESULT WINAPI HTMLWindow2_navigate(IHTMLWindow2 *iface, BSTR url) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(url)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_w(url)); + + return navigate_url(This->outer_window, url, This->outer_window->uri, BINDING_NAVIGATED); } static HRESULT WINAPI HTMLWindow2_put_onfocus(IHTMLWindow2 *iface, VARIANT v) diff --git a/dlls/mshtml/tests/nav_test.html b/dlls/mshtml/tests/nav_test.html index d106dfc..bc629a4 100644 --- a/dlls/mshtml/tests/nav_test.html +++ b/dlls/mshtml/tests/nav_test.html @@ -18,6 +18,7 @@ function nav_back_test() { } iframe.onload = function() { + iframe.onload = null; var href = iframe.contentWindow.location.href; ok(/.*blank2.html/.test(href), "Unexpected href " + href); next_test(); @@ -27,8 +28,24 @@ function nav_back_test() { subframe.src = "blank.html"; } +function window_navigate_test() { + external.trace("Runnint window.navigate() tests..."); + + var iframe = document.getElementById("testframe"); + + iframe.onload = function() { + iframe.onlod = null; + var href = iframe.contentWindow.location.href; + ok(href === "about:blank", "Unexpected href " + href); + next_test(); + } + + iframe.contentWindow.navigate("about:blank"); +} + var tests = [ nav_back_test, + window_navigate_test, function() { external.reportSuccess(); } ];

1 0

Thomas Faber : quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release.
by Alexandre Julliard July 29, 2014

July 29, 2014

Module: wine Branch: master Commit: 7c5d0789d0616556e57253f4fcd0e54c326569a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c5d0789d0616556e57253f4f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sun Jul 27 11:39:55 2014 +0200 quartz: Destroy BaseOutputPin in FileAsyncReaderPin_Release. --- dlls/quartz/filesource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 96d83a1..84e4214 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -849,7 +849,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) CloseHandle(This->hFile); This->csList.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csList); - CoTaskMemFree(This); + BaseOutputPin_Destroy(&This->pin); return 0; } return refCount;

1 0