wine-commits May 2011

wine-commits@winehq.org

2 participants
945 discussions

Hans Leidekker : Revert "msi: Avoid loading cabinet streams more than once. ".
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: c5ab1c37bf0d21bf46ffb0ab9446d0507fe33ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5ab1c37bf0d21bf46ffb0ab9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:09:28 2011 +0200 Revert "msi: Avoid loading cabinet streams more than once.". This reverts commit 395479f0d194b7b7e1cf6b766825f492faafde5d. --- dlls/msi/action.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4a56485..42c9274 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2123,8 +2123,6 @@ static UINT load_all_media( MSIPACKAGE *package ) MSIQUERY *view; UINT r; - if (!list_empty( &package->cabinet_streams )) return ERROR_SUCCESS; - r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Search all installation contexts in the FindRelatedProducts action.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 548d71ee4526a84296e4438bdcf9e4fed2f7bf15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548d71ee4526a84296e4438bd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:09:14 2011 +0200 msi: Search all installation contexts in the FindRelatedProducts action. --- dlls/msi/upgrade.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 8a0c43a..cae5af6 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -134,9 +134,9 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) TRACE("Looking at index %u product %s\n", index, debugstr_w(product)); unsquash_guid(product, productid); - rc = MSIREG_OpenProductKey(productid, NULL, package->Context, - &hukey, FALSE); - if (rc != ERROR_SUCCESS) + if (MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERMANAGED, &hukey, FALSE) && + MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, &hukey, FALSE) && + MSIREG_OpenProductKey(productid, NULL, MSIINSTALLCONTEXT_MACHINE, &hukey, FALSE)) { TRACE("product key not found\n"); rc = ERROR_SUCCESS;

1 0

Hans Leidekker : msi: Improve tracing in the FindRelatedProducts action.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 9e5562297dcea5e49f2a330e41bf1d7170890fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5562297dcea5e49f2a330e4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 17 11:08:49 2011 +0200 msi: Improve tracing in the FindRelatedProducts action. --- dlls/msi/upgrade.c | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index ef4f503..8a0c43a 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -123,33 +123,31 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) while (rc == ERROR_SUCCESS) { rc = RegEnumValueW(hkey, index, product, &sz, NULL, NULL, NULL, NULL); - TRACE("Looking at (%i) %s\n",index,debugstr_w(product)); if (rc == ERROR_SUCCESS) { WCHAR productid[GUID_SIZE]; - LPCWSTR ver; - LPCWSTR language; - LPCWSTR action_property; - DWORD check = 0x00000000; - DWORD comp_ver = 0x00000000; - DWORD sz = 0x100; + LPCWSTR ver, language, action_property; + DWORD check = 0, comp_ver, sz = 0x100; HKEY hukey; INT r; + TRACE("Looking at index %u product %s\n", index, debugstr_w(product)); + unsquash_guid(product, productid); rc = MSIREG_OpenProductKey(productid, NULL, package->Context, &hukey, FALSE); if (rc != ERROR_SUCCESS) { + TRACE("product key not found\n"); rc = ERROR_SUCCESS; index ++; continue; } sz = sizeof(DWORD); - RegQueryValueExW(hukey, INSTALLPROPERTY_VERSIONW, NULL, NULL, - (LPBYTE)&check, &sz); - /* check min */ + RegQueryValueExW(hukey, INSTALLPROPERTY_VERSIONW, NULL, NULL, (LPBYTE)&check, &sz); + + /* check version minimum */ ver = MSI_RecordGetString(rec,2); if (ver) { @@ -157,13 +155,14 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) r = check - comp_ver; if (r < 0 || (r == 0 && !(attributes & msidbUpgradeAttributesVersionMinInclusive))) { + TRACE("version below minimum\n"); RegCloseKey(hukey); index ++; continue; } } - /* check max */ + /* check version maximum */ ver = MSI_RecordGetString(rec,3); if (ver) { @@ -175,21 +174,21 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) index ++; continue; } + TRACE("version above maximum\n"); } - /* check language*/ + /* check language */ sz = sizeof(DWORD); - RegQueryValueExW(hukey, INSTALLPROPERTY_LANGUAGEW, NULL, NULL, - (LPBYTE)&check, &sz); + RegQueryValueExW(hukey, INSTALLPROPERTY_LANGUAGEW, NULL, NULL, (LPBYTE)&check, &sz); RegCloseKey(hukey); language = MSI_RecordGetString(rec,4); - TRACE("Checking languages %x and %s\n", check, - debugstr_w(language)); if (!check_language(check, language, attributes)) { index ++; continue; + TRACE("language doesn't match\n"); } + TRACE("found related product\n"); action_property = MSI_RecordGetString(rec, 7); append_productcode(package, action_property, productid);

1 0

Rico Schüller : d3dx9: Fix copy and paste mistake in ID3DXBaseEffect::GetPassDesc().
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: e9c4e501f426bea01c1216987f2c98804d037113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c4e501f426bea01c1216987… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 17 10:16:03 2011 +0200 d3dx9: Fix copy and paste mistake in ID3DXBaseEffect::GetPassDesc(). --- dlls/d3dx9_36/effect.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f0c44e1..5b32a88 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -817,7 +817,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetPassDesc(ID3DXBaseEffect *iface, D3 FIXME("Pixel shader and vertex shader are not supported, yet.\n"); desc->pVertexShaderFunction = NULL; - desc->pVertexShaderFunction = NULL; + desc->pPixelShaderFunction = NULL; return D3D_OK; }

1 0

Rico Schüller : d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: b7b9db00e336ce2b945c7049c672f54d70948a0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b9db00e336ce2b945c7049c… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue May 17 10:15:52 2011 +0200 d3dx9: Remove some checks for defines argument in D3DXCreateEffect* functions. --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4332386..f0c44e1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4554,7 +4554,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExW(LPDIRECT3DDEVICE9 device, LPCWSTR src TRACE("(%s): relay\n", debugstr_w(srcfile)); - if (!device || !srcfile || !defines) + if (!device || !srcfile) return D3DERR_INVALIDCALL; ret = map_view_of_file(srcfile, &buffer, &size); @@ -4578,7 +4578,7 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(LPDIRECT3DDEVICE9 device, LPCSTR srcf TRACE("(void): relay\n"); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0); @@ -4615,7 +4615,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExW(LPDIRECT3DDEVICE9 device, HMODULE TRACE("(%p, %s): relay\n", srcmodule, debugstr_w(srcresource)); - if (!device || !defines) + if (!device) return D3DERR_INVALIDCALL; resinfo = FindResourceW(srcmodule, srcresource, (LPCWSTR) RT_RCDATA); @@ -4645,7 +4645,7 @@ HRESULT WINAPI D3DXCreateEffectFromResourceExA(LPDIRECT3DDEVICE9 device, HMODULE TRACE("(%p, %s): relay\n", srcmodule, debugstr_a(srcresource)); - if (!device || !defines) + if (!device) return D3DERR_INVALIDCALL; resinfo = FindResourceA(srcmodule, srcresource, (LPCSTR) RT_RCDATA); @@ -4692,7 +4692,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(LPCWSTR srcfile, const D3DXMACR TRACE("(%s): relay\n", debugstr_w(srcfile)); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; ret = map_view_of_file(srcfile, &buffer, &size); @@ -4715,7 +4715,7 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(LPCSTR srcfile, const D3DXMACRO TRACE("(void): relay\n"); - if (!srcfile || !defines) + if (!srcfile) return D3DERR_INVALIDCALL; len = MultiByteToWideChar(CP_ACP, 0, srcfile, -1, NULL, 0);

1 0

Erich Hoover : quartz: Create and hold onto a preferred allocator for IAsyncReader:: RequestAllocator.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 068593b23826c995f03559128041b922b68a916b URL: http://source.winehq.org/git/wine.git/?a=commit;h=068593b23826c995f03559128… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat May 14 11:44:59 2011 -0600 quartz: Create and hold onto a preferred allocator for IAsyncReader::RequestAllocator. --- dlls/quartz/pin.c | 18 +++++++++++++++++- dlls/quartz/pin.h | 1 + 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index bd5cffd..2a3b2d1 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -283,6 +283,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const This->pReader = NULL; This->pAlloc = NULL; + This->prefAlloc = NULL; if (SUCCEEDED(hr)) { hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); @@ -293,9 +294,19 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const hr = This->fnPreConnect(iface, pReceivePin, &props); } + /* + * Some custom filters (such as the one used by Fallout 3 + * and Fallout: New Vegas) expect to be passed a non-NULL + * preferred allocator. + */ if (SUCCEEDED(hr)) { - hr = IAsyncReader_RequestAllocator(This->pReader, NULL, &props, &This->pAlloc); + hr = StdMemAllocator_create(NULL, (LPVOID *) &This->prefAlloc); + } + + if (SUCCEEDED(hr)) + { + hr = IAsyncReader_RequestAllocator(This->pReader, This->prefAlloc, &props, &This->pAlloc); } if (SUCCEEDED(hr)) @@ -314,6 +325,9 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const if (This->pReader) IAsyncReader_Release(This->pReader); This->pReader = NULL; + if (This->prefAlloc) + IMemAllocator_Release(This->prefAlloc); + This->prefAlloc = NULL; if (This->pAlloc) IMemAllocator_Release(This->pAlloc); This->pAlloc = NULL; @@ -366,6 +380,8 @@ ULONG WINAPI PullPin_Release(IPin *iface) WaitForSingleObject(This->hEventStateChanged, INFINITE); assert(!This->hThread); + if(This->prefAlloc) + IMemAllocator_Release(This->prefAlloc); if(This->pAlloc) IMemAllocator_Release(This->pAlloc); if(This->pReader) diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index 7326061..de2ccd6 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -73,6 +73,7 @@ typedef struct PullPin REFERENCE_TIME rtStart, rtCurrent, rtNext, rtStop; IAsyncReader * pReader; + IMemAllocator * prefAlloc; IMemAllocator * pAlloc; QUERYACCEPTPROC fnQueryAccept; SAMPLEPROC_PULL fnSampleProc;

1 0

Erich Hoover : quartz: Make sure pin state cannot change while a flush is in progress.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 493a3a0f9da826587654c99d22d48451e1de51a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=493a3a0f9da826587654c99d2… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat May 14 11:15:06 2011 -0600 quartz: Make sure pin state cannot change while a flush is in progress. --- dlls/quartz/pin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 7f75c36..bd5cffd 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -387,6 +387,9 @@ static void PullPin_Flush(PullPin *This) if (This->pReader) { + /* Do not allow state to change while flushing */ + EnterCriticalSection(This->pin.pCritSec); + /* Flush outstanding samples */ IAsyncReader_BeginFlush(This->pReader); @@ -405,6 +408,8 @@ static void PullPin_Flush(PullPin *This) } IAsyncReader_EndFlush(This->pReader); + + LeaveCriticalSection(This->pin.pCritSec); } }

1 0

Erich Hoover : quartz: Release outstanding samples in PullPin:: PauseProcessing.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 484c952cf2e76494616b7c5a629109a2361e8394 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484c952cf2e76494616b7c5a6… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat May 14 11:15:01 2011 -0600 quartz: Release outstanding samples in PullPin::PauseProcessing. --- dlls/quartz/pin.c | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 852fd4b..7f75c36 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -473,10 +473,22 @@ static void PullPin_Thread_Process(PullPin *This) } } while (This->rtCurrent < This->rtStop && hr == S_OK && !This->stop_playback); - /* Sample was rejected, and we are asked to terminate */ - if (pSample) + /* + * Sample was rejected, and we are asked to terminate. When there is more than one buffer + * it is possible for a filter to have several queued samples, making it necessary to + * release all of these pending samples. + */ + if (This->stop_playback || FAILED(hr)) { - IMediaSample_Release(pSample); + DWORD_PTR dwUser; + + do + { + if (pSample) + IMediaSample_Release(pSample); + pSample = NULL; + IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); + } while(pSample); } /* Can't reset state to Sleepy here because that might race, instead PauseProcessing will do that for us @@ -625,11 +637,27 @@ HRESULT PullPin_PauseProcessing(PullPin * This) assert(This->state == Req_Run|| This->state == Req_Sleepy); assert(WaitForSingleObject(This->thread_sleepy, 0) == WAIT_TIMEOUT); + This->state = Req_Pause; This->stop_playback = 1; ResetEvent(This->hEventStateChanged); SetEvent(This->thread_sleepy); + /* Release any outstanding samples */ + if (This->pReader) + { + IMediaSample *pSample; + DWORD_PTR dwUser; + + do + { + pSample = NULL; + IAsyncReader_WaitForNext(This->pReader, 0, &pSample, &dwUser); + if (pSample) + IMediaSample_Release(pSample); + } while(pSample); + } + LeaveCriticalSection(This->pin.pCritSec); }

1 0

Erich Hoover : quartz: Return IMediaSeeking interface for Parser PullPin.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 819643ada87a4b033bfd93f84894d5a15b35eb70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819643ada87a4b033bfd93f84… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat May 14 11:14:45 2011 -0600 quartz: Return IMediaSeeking interface for Parser PullPin. --- dlls/quartz/parser.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index b5a305c..784c528 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -702,6 +702,31 @@ static const IPinVtbl Parser_OutputPin_Vtbl = BasePinImpl_NewSegment }; +static HRESULT WINAPI Parser_PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) +{ + PullPin *This = (PullPin *)iface; + + TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); + + *ppv = NULL; + + /* + * It is important to capture the request for the IMediaSeeking interface before it is passed + * on to PullPin_QueryInterface, this is necessary since the Parser filter does not support + * querying IMediaSeeking + */ + if (IsEqualIID(riid, &IID_IMediaSeeking)) + *ppv = &((ParserImpl*)This->pin.pinInfo.pFilter)->sourceSeeking; + + if (*ppv) + { + IUnknown_AddRef((IUnknown *)(*ppv)); + return S_OK; + } + + return PullPin_QueryInterface(iface, riid, ppv); +} + static HRESULT WINAPI Parser_PullPin_Disconnect(IPin * iface) { HRESULT hr; @@ -770,7 +795,7 @@ static HRESULT WINAPI Parser_PullPin_EnumMediaTypes(IPin *iface, IEnumMediaTypes static const IPinVtbl Parser_InputPin_Vtbl = { - PullPin_QueryInterface, + Parser_PullPin_QueryInterface, BasePinImpl_AddRef, PullPin_Release, BaseInputPinImpl_Connect,

1 0

Erich Hoover : quartz: Return IMediaSeeking interface for Parser OutputPin.
by Alexandre Julliard 17 May '11

17 May '11

Module: wine Branch: master Commit: 7a405fa9e95860eb40121cb73799fd874097de08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a405fa9e95860eb40121cb73… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sat May 14 11:14:36 2011 -0600 quartz: Return IMediaSeeking interface for Parser OutputPin. --- dlls/quartz/parser.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 9d7baa0..b5a305c 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -624,10 +624,9 @@ static HRESULT WINAPI Parser_OutputPin_QueryInterface(IPin * iface, REFIID riid, *ppv = iface; else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; + /* The Parser filter does not support querying IMediaSeeking, return it directly */ else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(This->pin.pin.pinInfo.pFilter, &IID_IMediaSeeking, ppv); - } + *ppv = &((ParserImpl*)This->pin.pin.pinInfo.pFilter)->sourceSeeking; if (*ppv) {

1 0

← Newer
1
...
45
46
47
48
49
50
51
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2011