May 2012 - Wine-Devel - list.winehq.org

Re: windowscodecs: Add a stubbed out IWICMetadataBlockReader interface.
by Vincent Povirk May 24, 2012

May 24, 2012

Please add a test showing that some builtin metadata handler implements this interface. On Thu, May 24, 2012 at 4:39 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/windowscodecs/metadatahandler.c | 69 ++++++++++++++++++++++++++++++++++ > 1 file changed, 69 insertions(+) > > diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c > index afcff21..ffe6763 100644 > --- a/dlls/windowscodecs/metadatahandler.c > +++ b/dlls/windowscodecs/metadatahandler.c > @@ -39,6 +39,7 @@ typedef struct MetadataHandler { > IWICMetadataWriter IWICMetadataWriter_iface; > LONG ref; > IWICPersistStream IWICPersistStream_iface; > + IWICMetadataBlockReader IWICMetadataBlockReader_iface; > const MetadataHandlerVtbl *vtable; > MetadataItem *items; > DWORD item_count; > @@ -55,6 +56,11 @@ static inline MetadataHandler *impl_from_IWICPersistStream(IWICPersistStream *if > return CONTAINING_RECORD(iface, MetadataHandler, IWICPersistStream_iface); > } > > +static inline MetadataHandler *impl_from_IWICMetadataBlockReader(IWICMetadataBlockReader *iface) > +{ > + return CONTAINING_RECORD(iface, MetadataHandler, IWICMetadataBlockReader_iface); > +} > + > static void MetadataHandler_FreeItems(MetadataHandler *This) > { > int i; > @@ -92,6 +98,10 @@ static HRESULT WINAPI MetadataHandler_QueryInterface(IWICMetadataWriter *iface, > { > *ppv = &This->IWICPersistStream_iface; > } > + else if (IsEqualIID(&IID_IWICMetadataBlockReader, iid)) > + { > + *ppv = &This->IWICMetadataBlockReader_iface; > + } > else > { > *ppv = NULL; > @@ -317,6 +327,64 @@ static const IWICPersistStreamVtbl MetadataHandler_PersistStream_Vtbl = { > MetadataHandler_SaveEx > }; > > +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_QueryInterface(IWICMetadataBlockReader *iface, > + REFIID iid, void **ppv) > +{ > + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); > + return IWICMetadataWriter_QueryInterface(&This->IWICMetadataWriter_iface, iid, ppv); > +} > + > +static ULONG WINAPI MetadataHandler_MetadataBlockReader_AddRef(IWICMetadataBlockReader *iface) > +{ > + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); > + return IWICMetadataWriter_AddRef(&This->IWICMetadataWriter_iface); > +} > + > +static ULONG WINAPI MetadataHandler_MetadataBlockReader_Release(IWICMetadataBlockReader *iface) > +{ > + MetadataHandler *This = impl_from_IWICMetadataBlockReader(iface); > + return IWICMetadataWriter_Release(&This->IWICMetadataWriter_iface); > +} > + > +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetContainerFormat( > + IWICMetadataBlockReader *iface, GUID *guid) > +{ > + FIXME("(%p,%p): stub\n", iface, guid); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetCount( > + IWICMetadataBlockReader *iface, UINT *count) > +{ > + FIXME("(%p,%p): stub\n", iface, count); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetReaderByIndex( > + IWICMetadataBlockReader *iface, UINT index, IWICMetadataReader **reader) > +{ > + FIXME("(%p,%u,%p): stub\n", iface, index, reader); > + return E_NOTIMPL; > +} > + > +static HRESULT WINAPI MetadataHandler_MetadataBlockReader_GetEnumerator( > + IWICMetadataBlockReader *iface, IEnumUnknown **enum_metadata) > +{ > + FIXME("(%p,%p): stub\n", iface, enum_metadata); > + return E_NOTIMPL; > +} > + > +static const IWICMetadataBlockReaderVtbl MetadataHandler_MetadataBlockReader_Vtbl = > +{ > + MetadataHandler_MetadataBlockReader_QueryInterface, > + MetadataHandler_MetadataBlockReader_AddRef, > + MetadataHandler_MetadataBlockReader_Release, > + MetadataHandler_MetadataBlockReader_GetContainerFormat, > + MetadataHandler_MetadataBlockReader_GetCount, > + MetadataHandler_MetadataBlockReader_GetReaderByIndex, > + MetadataHandler_MetadataBlockReader_GetEnumerator > +}; > + > HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkOuter, REFIID iid, void** ppv) > { > MetadataHandler *This; > @@ -333,6 +401,7 @@ HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, IUnknown *pUnkO > > This->IWICMetadataWriter_iface.lpVtbl = &MetadataHandler_Vtbl; > This->IWICPersistStream_iface.lpVtbl = &MetadataHandler_PersistStream_Vtbl; > + This->IWICMetadataBlockReader_iface.lpVtbl = &MetadataHandler_MetadataBlockReader_Vtbl; > This->ref = 1; > This->vtable = vtable; > This->items = NULL; > -- > 1.7.10.1 > > >

1 0

Testing regedit
by Daniel Jelinski May 24, 2012

May 24, 2012

Hello, I just noticed that wine's regedit has a few interesting bugs that appear when running with native comctl32. Can I/should I file them in the bugzilla? Regards, Daniel

3 3

Re: [PATCH variant 1] dsound: use a low-quality FIR for games
by Andrew Eikum May 23, 2012

May 23, 2012

Thanks Alexander. Thoughts below... On Sat, May 19, 2012 at 09:09:35PM +0600, Alexander E. Patrakov wrote: > There are two ways to implement a high-performance resampler, and I > have prepared (conflicting, pick no more than one) patches for both: > > 1 (this patch): Use a shorter FIR with the existing code. This has the > advantage of higher quality (unwanted frequencies are at least > attempted to be rejected) and almost no new code. > 2 (the other patch): Write new code. E.g., linear interpolation. This > is what Windows XP does at its lowest quality setting, and it eats > less CPU than variant 1. > Do you have an opinion on which of these patches to use? The low-quality FIR has the advantage of not introducing another codepath. On the other hand, the linear resampler codepath is very simple, and even easier on the CPU. I'm leaning towards the linear resampler for its larger CPU usage benefits. > Also note that, as evicenced by the debugging patch, a Core 2 Duo > E6420 @ 2.13 GHz _can_ resample more than 32 streams simultaneously > from various weird rates to 48000 Hz. As GTA:SA reportedly creates > only 16 secondary buffers, it _should_ have more than enough CPU time > to mix them. IMHO, this makes bug #30639 look somewhat strange: on > GyB's computer, GTA:SA stutters, while Darwinia (which looks more > demanding about sound) doesn't. It may well be that in fact none of my > patches are needed, and that the real bug is that the CPU-intensive > cp_fields() function is called from a wrong thread or process. I don't > have the expertise needed to debug this. > I did some research on this. Darwinia creates up to 32 buffers, like you said. GTA:SA creates and destroys buffers as needed, and I saw it go as high as 31 in a quick test. Darwinia's buffer frequencies range in the 40-90 kHz range and resample to 22050 Hz, while GTA:SA's range around 10-20 kHz and resample to 48 kHz. So in each time step, GTA:SA requires about 1000-2000 get_current_sample() calls, but 4800 FIR convolutions per buffer. Darwinia requires 4000-9000 get_current_sample() calls, but only about 2200 convolutions per buffer. I suspect the convolutions are considerably more expensive than the get_current_sample() calls, so I would actually expect GTA:SA to be more CPU taxing. That should explain what's going on here. We could test this on Gyb's machine by setting DefaultSampleRate=22050 and hacking <dlls/dsound/primary.c:primarybuffer_SetFormat> to return S_OK without actually changing the primary buffer's format. That should give GTA:SA similar cp_fields performance to Darwinia, and I expect it would fix the lag issue. Andrew

2 2

Re: vbscript: Add support for integer values in conditional jumps.
by Marvin May 23, 2012

May 23, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=18547 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

2 1

Re: [2/2] gdi32: Add support for emulating bold faces of bitmap fonts. Take 2. Resend.
by Bruno Jesus May 22, 2012

May 22, 2012

On Mon, Apr 30, 2012 at 6:52 AM, Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > --- > dlls/gdi32/freetype.c | 35 +++++++++++++++++++- > dlls/gdi32/tests/font.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 116 insertions(+), 2 deletions(-) I don't know if this patch was directly related to a bug or not but now we are sure it does really fix at least this bug: http://bugs.winehq.org/show_bug.cgi?id=12476 Best wishes, Bruno

1 0

Re: wineqtdecoder: Recreate audio extraction session when we run out of frames.
by Alexandre Julliard May 22, 2012

May 22, 2012

Aric Stewart <aric(a)codeweavers.com> writes: > This is instead of waiting until a movie is fully loaded before being > able to start playing. This eliminates the up to several second pause > when starting some, mostly avi, movies. > --- > dlls/wineqtdecoder/qtsplitter.c | 66 > +++++++++++++++++++++++++++++++++------ > 1 files changed, 56 insertions(+), 10 deletions(-) What about the comment that says that we can't do that? -- Alexandre Julliard julliard(a)winehq.org

2 1

winetricks & DLL overrides
by wylda＠volny.cz May 21, 2012

May 21, 2012

Hi Dan, i'm happy user of winetricks and thanks for all that work. Today i found out, that i wasn't able to reveal, that apps uses some native dll when using: winetricks settings alldlls=builtin further checking revealed, that winetricks(20120308) has several no longer available dll override compared to winecfg and some are missing, thus application uses them as native. So i add/del dlls from override_all_dlls list based on winecfg (1.5.3-164-gdec3d50) and the result is attached as a patch. Probably unusable for you, because: * no care about line length * i do not know whether removing no longer available dll's override is allowed (what's happen for users using old wine-1.0 and need dlls's override no longer available in wine-1.5.3) * shouldn’t be the dll's override in user.reg simply overwritten? As i noticed the names are there twice - 2nd one with "*" prefix making it confusing, which value will be used and the list in winecfg is twice as long. Thanks and regards, W.

2 2

Re: [1/2] ole32: Forward OleCreateLinkFromData and OleCreateStaticFromData to OleCreateFromData.
by Alexandre Julliard May 21, 2012

May 21, 2012

Dmitry Timoshkov <dmitry(a)baikal.ru> writes: > +/****************************************************************************** > + * OleCreateLinkFromData [OLE32.@] > + */ > +HRESULT WINAPI OleCreateLinkFromData(LPDATAOBJECT data, REFIID iid, > + DWORD renderopt, LPFORMATETC fmt, > + LPOLECLIENTSITE client_site, LPSTORAGE stg, > + LPVOID *obj) > +{ > + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); > +} > + > +/****************************************************************************** > + * OleCreateStaticFromData [OLE32.@] > + */ > +HRESULT WINAPI OleCreateStaticFromData(LPDATAOBJECT data, REFIID iid, > + DWORD renderopt, LPFORMATETC fmt, > + LPOLECLIENTSITE client_site, LPSTORAGE stg, > + LPVOID *obj) > +{ > + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); > +} Surely there's more to these functions than that. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: quartz/tests: Fix compilation on systems that don't support nameless structs.
by Marvin May 21, 2012

May 21, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=18512 Your paranoid android. === WNT4WSSP6 (32 bit filtermapper) === filtermapper.c:96: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:233: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:347: Test failed: CoCreateInstance failed with 80040154 filtermapper.c:405: Test failed: CoCreateInstance failed with 80040154

2 1

Re: [PATCH 3/3] shell32: Move the pidl handling to the ExtractIcon_Constructor
by Nikolay Sivov May 20, 2012

May 20, 2012

On 5/20/2012 18:47, Detlef Riekenberg wrote: > } else if (IsEqualIID(riid,&IID_IExtractIconA)&&(cidl == 1)) { > - pidl = ILCombine(This->pidlRoot, apidl[0]); > - pObj = (LPUNKNOWN) IExtractIconA_Constructor(pidl); > - SHFree(pidl); > - hr = S_OK; > + return IExtractIconAW_Constructor(This->pidlRoot, apidl[0], FALSE, ppvOut); > } else if (IsEqualIID(riid,&IID_IExtractIconW)&&(cidl == 1)) { > - pidl = ILCombine(This->pidlRoot, apidl[0]); > - pObj = (LPUNKNOWN) IExtractIconW_Constructor(pidl); > - SHFree(pidl); > - hr = S_OK; > + return IExtractIconAW_Constructor(This->pidlRoot, apidl[0], TRUE, ppvOut); > } else if ((IsEqualIID(riid,&IID_IShellLinkW) || IsEqualIID(riid,&IID_IShellLinkA)) I think it's better to pass riid to constructor helper and return appropriate vtable according to that riid. That will also collapse this to a single 'if' testing for both interfaces. > +HRESULT IExtractIconAW_Constructor(LPCITEMIDLIST root, LPCITEMIDLIST item, BOOL is_unicode, void ** ppvOut) > { > - IExtractIconWImpl *ei; > + IExtractIconWImpl *ei = HeapAlloc(GetProcessHeap(), 0, sizeof(IExtractIconWImpl)); > + LPITEMIDLIST pidl = ILCombine(root, item); > > - TRACE("%p\n", pidl); > + if (!pidl || !ei) { > + SHFree(pidl); > + HeapFree(GetProcessHeap(), 0, ei); > + return E_OUTOFMEMORY; > + } > > - ei = HeapAlloc(GetProcessHeap(), 0, sizeof(*ei)); > ei->ref=1; > ei->IExtractIconW_iface.lpVtbl =&eivt; > ei->IExtractIconA_iface.lpVtbl =&eiavt; > ei->IPersistFile_iface.lpVtbl =&pfvt; > ei->pidl=ILClone(pidl); > > - pdump(pidl); Same here as in previous patch - storing combined result vs. making another clone.

1 0