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

Erich E. Hoover : strmbase: Fix race condition on InputPin_EndOfStream between csRenderLock and filter.csFilter.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: a9325037b535eacd669cddb003f70c855d6a32ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9325037b535eacd669cddb00… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jul 17 10:37:37 2014 -0600 strmbase: Fix race condition on InputPin_EndOfStream between csRenderLock and filter.csFilter. --- dlls/strmbase/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 9b9c225..99c9278 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -105,8 +105,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) TRACE("(%p/%p)->()\n", This, pFilter); - EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_EndOfStream(iface); EnterCriticalSection(This->pin.pCritSec); if (SUCCEEDED(hr)) @@ -117,8 +117,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) hr = BaseRendererImpl_EndOfStream(pFilter); } LeaveCriticalSection(This->pin.pCritSec); - LeaveCriticalSection(&pFilter->csRenderLock); LeaveCriticalSection(&pFilter->filter.csFilter); + LeaveCriticalSection(&pFilter->csRenderLock); return hr; }

1 0

Erich E. Hoover : strmbase: Fix race condition on InputPin_BeginFlush between csRenderLock and filter.csFilter.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: c22547792a2e135bace39ace42ba9e7caa7f48d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c22547792a2e135bace39ace4… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jul 17 10:28:42 2014 -0600 strmbase: Fix race condition on InputPin_BeginFlush between csRenderLock and filter.csFilter. --- dlls/strmbase/renderer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 766e467..3acca0f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -130,8 +130,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, iface); - EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr))

1 0

Hao Peng : iphlpapi: Add PfBindInterfaceToIPAddress function stub.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 331092b54e26e680c13b9c7d5e6b120e4c62d49e URL: http://source.winehq.org/git/wine.git/?a=commit;h=331092b54e26e680c13b9c7d5… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jul 31 15:26:58 2014 +0800 iphlpapi: Add PfBindInterfaceToIPAddress function stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 36ba13f..655fda1c 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -245,7 +245,7 @@ #@ stub ParseNetworkString @ stub _PfAddFiltersToInterface(a)24 @ stub _PfAddGlobalFilterToInterface(a)8 -@ stub _PfBindInterfaceToIPAddress(a)12 +@ stdcall _PfBindInterfaceToIPAddress(a)12(long long ptr) PfBindInterfaceToIPAddress @ stub _PfBindInterfaceToIndex(a)16 @ stdcall _PfCreateInterface(a)24(long long long long long ptr) PfCreateInterface @ stub _PfDeleteInterface(a)4 diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 70a063b..8d8c39c 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2511,6 +2511,15 @@ DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWAR } /****************************************************************** + * PfBindInterfaceToIPAddress(IPHLPAPI.@) + */ +DWORD WINAPI PfBindInterfaceToIPAddress(INTERFACE_HANDLE interface, PFADDRESSTYPE type, PBYTE ip) +{ + FIXME("(%p %d %p) stub\n", interface, type, ip); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** * GetTcpTable2 (IPHLPAPI.@) */ ULONG WINAPI GetTcpTable2(PMIB_TCPTABLE2 table, PULONG size, BOOL order)

1 0

Erich E. Hoover : quartz: Fix race condition on EndFlush between csRenderLock and filter.csFilter.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: ee94725c8ea49a42130954a49a7c8b2ab3359c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee94725c8ea49a42130954a49… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jul 17 10:31:17 2014 -0600 quartz: Fix race condition on EndFlush between csRenderLock and filter.csFilter. --- dlls/quartz/videorenderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 4e8f359..571a19d 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -374,11 +374,11 @@ static HRESULT WINAPI VideoRenderer_EndFlush(BaseRenderer* iface) if (This->renderer.pMediaSample) { ResetEvent(This->hEvent); LeaveCriticalSection(iface->pInputPin->pin.pCritSec); - LeaveCriticalSection(&iface->csRenderLock); LeaveCriticalSection(&iface->filter.csFilter); + LeaveCriticalSection(&iface->csRenderLock); WaitForSingleObject(This->hEvent, INFINITE); - EnterCriticalSection(&iface->filter.csFilter); EnterCriticalSection(&iface->csRenderLock); + EnterCriticalSection(&iface->filter.csFilter); EnterCriticalSection(iface->pInputPin->pin.pCritSec); } if (This->renderer.filter.state == State_Paused) {

1 0

Erich E. Hoover : quartz: Fix race condition on EndOfStream between csRenderLock and filter.csFilter.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 126a420c5630332f4370f3662b1eb53b21e934ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=126a420c5630332f4370f3662… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jul 17 10:30:19 2014 -0600 quartz: Fix race condition on EndOfStream between csRenderLock and filter.csFilter. --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 57e3d3b..8c67374 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -254,8 +254,8 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); WaitForSingleObject(This->blocked, 10); - EnterCriticalSection(&This->renderer.filter.csFilter); EnterCriticalSection(&This->renderer.csRenderLock); + EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; }

1 0

Hao Peng : iphlpapi: Add PfDeleteInterface function stub.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 240e66a281f9588bc943181d62c96460132f6c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=240e66a281f9588bc943181d6… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jul 31 15:27:47 2014 +0800 iphlpapi: Add PfDeleteInterface function stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 655fda1c..1e422f4 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -248,7 +248,7 @@ @ stdcall _PfBindInterfaceToIPAddress(a)12(long long ptr) PfBindInterfaceToIPAddress @ stub _PfBindInterfaceToIndex(a)16 @ stdcall _PfCreateInterface(a)24(long long long long long ptr) PfCreateInterface -@ stub _PfDeleteInterface(a)4 +@ stdcall _PfDeleteInterface(a)4(long) PfDeleteInterface @ stub _PfDeleteLog(a)0 @ stub _PfGetInterfaceStatistics(a)16 @ stub _PfMakeLog(a)4 diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 8d8c39c..0d9e371 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2511,6 +2511,15 @@ DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWAR } /****************************************************************** + * PfDeleteInterface(IPHLPAPI.@) + */ +DWORD WINAPI PfDeleteInterface(INTERFACE_HANDLE interface) +{ + FIXME("(%p) stub\n", interface); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** * PfBindInterfaceToIPAddress(IPHLPAPI.@) */ DWORD WINAPI PfBindInterfaceToIPAddress(INTERFACE_HANDLE interface, PFADDRESSTYPE type, PBYTE ip)

1 0

Austin English : wine.inf: Fix quoting for msiexec commands.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 8bf602630844de72809912c697d3f6005303f719 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf602630844de72809912c69… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 5 14:04:50 2014 -0700 wine.inf: Fix quoting for msiexec commands. --- loader/wine.inf.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 127c67c..42a750e 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -204,12 +204,12 @@ HKCR,lnkfile\shellex\ContextMenuHandlers\{00021401-0000-0000-C000-000000000046}, HKCR,MediaFoundation,,16 HKCR,Msi.Package,,2,"Windows Installer Package" HKCR,Msi.Package\DefaultIcon,,2,"msiexec.exe" -HKCR,Msi.Package\shell\Open\command,,2,'%11%\msiexec.exe /i ""%1""' -HKCR,Msi.Package\shell\Repair\command,,2,'%11%\msiexec.exe /f ""%1""' -HKCR,Msi.Package\shell\Uninstall\command,,2,'%11%\msiexec.exe /x ""%1""' +HKCR,Msi.Package\shell\Open\command,,2,"%11%\msiexec.exe /i ""%1""" +HKCR,Msi.Package\shell\Repair\command,,2,"%11%\msiexec.exe /f ""%1""" +HKCR,Msi.Package\shell\Uninstall\command,,2,"%11%\msiexec.exe /x ""%1""" HKCR,Msi.Patch,,2,"Windows Installer Patch" HKCR,Msi.Patch\DefaultIcon,,2,"msiexec.exe" -HKCR,Msi.Patch\shell\Open\command,,2,'%11%\msiexec.exe /p ""%1""' +HKCR,Msi.Patch\shell\Open\command,,2,"%11%\msiexec.exe /p ""%1""" HKCR,rtffile,,2,"Rich Text Document" HKCR,rtffile\shell\open\command,,2,"%11%\wordpad.exe %1" HKCR,rtffile\shell\print\command,,2,"%11%\wordpad.exe /p %1"

1 0

Erich E. Hoover : quartz: Fix race condition between EndOfStream and Pause.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: dd3278577260788b5e5349be17b5c90ba3657175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd3278577260788b5e5349be1… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jul 18 10:57:13 2014 -0600 quartz: Fix race condition between EndOfStream and Pause. --- dlls/quartz/dsoundrender.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8c67374..2914b15 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -243,7 +243,7 @@ end: static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) { - while (1) + while (This->renderer.filter.state == State_Running) { DWORD pos1, pos2; DSoundRender_UpdatePositions(This, &pos1, &pos2);

1 0

Erich E. Hoover : strmbase: Fix race condition on InputPin_EndFlush between csRenderLock and filter.csFilter.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 47425a5801e7972e5e78e3561db0c37f02008e6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=47425a5801e7972e5e78e3561… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Jul 17 10:35:43 2014 -0600 strmbase: Fix race condition on InputPin_EndFlush between csRenderLock and filter.csFilter. --- dlls/strmbase/renderer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 3acca0f..9b9c225 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -155,8 +155,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) TRACE("(%p/%p)->()\n", This, pFilter); - EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(&pFilter->csRenderLock); + EnterCriticalSection(&pFilter->filter.csFilter); EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) @@ -167,8 +167,8 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) hr = BaseRendererImpl_EndFlush(pFilter); } LeaveCriticalSection(This->pin.pCritSec); - LeaveCriticalSection(&pFilter->csRenderLock); LeaveCriticalSection(&pFilter->filter.csFilter); + LeaveCriticalSection(&pFilter->csRenderLock); return hr; }

1 0

Hao Peng : iphlpapi: Add PfUnBindInterface function stub.
by Alexandre Julliard Aug. 5, 2014

Aug. 5, 2014

Module: wine Branch: master Commit: 8128ddfac86c480cc25669e8ec08477dbe393976 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8128ddfac86c480cc25669e8e… Author: Hao Peng <penghao(a)linuxdeepin.com> Date: Thu Jul 31 15:28:04 2014 +0800 iphlpapi: Add PfUnBindInterface function stub. --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 1e422f4..9e66d67 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -258,7 +258,7 @@ @ stub _PfRemoveGlobalFilterFromInterface(a)8 @ stub _PfSetLogBuffer(a)28 @ stub _PfTestPacket(a)20 -@ stub _PfUnBindInterface(a)4 +@ stdcall _PfUnBindInterface(a)4(long) PfUnBindInterface #@ stub register_icmp #@ stub ResolveIpNetEntry2 #@ stub ResolveNeighbor diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0d9e371..88db25a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2511,6 +2511,15 @@ DWORD WINAPI PfCreateInterface(DWORD dwName, PFFORWARD_ACTION inAction, PFFORWAR } /****************************************************************** + * PfUnBindInterface (IPHLPAPI.@) + */ +DWORD WINAPI PfUnBindInterface(INTERFACE_HANDLE interface) +{ + FIXME("(%p) stub\n", interface); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************** * PfDeleteInterface(IPHLPAPI.@) */ DWORD WINAPI PfDeleteInterface(INTERFACE_HANDLE interface)

1 0