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

ru.po: improved an Russian translation
by Oleg Yarigin May 30, 2012

May 30, 2012

There are some improvements of a style (now it is more official) and non-translated empty lines. To avoid an character encoding interruption, I send the diff file as a packed text file attachment (ru_diff.txt.bz2, 22.3 KB).

3 2

stub for SetThreadStackGuarantee
by Daniel Jelinski May 29, 2012

May 29, 2012

Hello, SQL Server Management Studio 2005 needs SetThreadStackGuarantee to either be absent or return TRUE - otherwise it refuses to run at all. Is there a reason for this stub to return FALSE? Regards, Daniel

1 0

Re: kernel32/volume: Don't modify the last error in GetVolumeInformation
by Alexandre Julliard May 29, 2012

May 29, 2012

Alexandre Goujon <ale.goujon(a)gmail.com> writes: > @@ -729,6 +731,8 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len, > } > else > { > + /* At this point, last error is ERROR_NOT_SUPPORTED. Restoring the previous one */ > + SetLastError(lastError); You should never need to do that sort of thing, there are no guarantees about last error on success. -- Alexandre Julliard julliard(a)winehq.org

2 1

Implementing joystick ids in DirectInput
by Lucas Zawacki May 29, 2012

May 29, 2012

Hey guys, asking for a little code review here... I was looking at the solution for this bug http://bugs.winehq.org/show_bug.cgi?id=30705 and it comes down to implementing the DIPROP_JOYSTICKSID property for joystick devices. After some research on what this is I know it's always a number between (0,n), where n is the number of joysticks connected, and is analogous to the winmm driver joystick id. The solution I came up is in the attached patch, it's a little weird but I found it hard to give a unique ID to each joystick on Linux when they can come from different drivers. This solution uses the order which dinput puts the joysticks on it's device list and will work regardless. If someone has a better way to do it I'd like to know. Cheers,

2 2

Re: [PATCH 1/3] ntdll: Implement RtlGetProductInfo and use it for GetProductInfo
by Alexandre Julliard May 29, 2012

May 29, 2012

Detlef Riekenberg <wine.dev(a)web.de> writes: > The wrapper in kernel32 is not needed. > RtlGetProductInfo and GetProductInfo have the same signature and > tests show the same results. No they don't have the same signature, look closer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [2/5] d3dx9: Implement D3DXSaveSurfaceToFileInMemory.
by Vincent Povirk May 28, 2012

May 28, 2012

> - hr = IWICImagingFactory_CreateStream(factory, &stream); > + hr = IWICImagingFactory_CreateStream(factory, &wic_stream); > IWICImagingFactory_Release(factory); > if (FAILED(hr)) goto cleanup_err; > > - hr = IWICStream_InitializeFromFilename(stream, dst_filename, GENERIC_WRITE); > + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); > if (FAILED(hr)) goto cleanup_err; > > + hr = IWICStream_InitializeFromIStream(wic_stream, stream); Why bother creating an IWICStream here? Just use your HGLOBAL stream to initialize the encoder.

1 0

Re: [1/5] windowscodecs: Implement IWICStream::InitializeFromIStream.
by Vincent Povirk May 28, 2012

May 28, 2012

> +static HRESULT WINAPI StreamOnStream_Seek(IStream *iface, > + LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) > +{ > + StreamOnStream *This = StreamOnStream_from_IStream(iface); > + HRESULT hr=S_OK; > + TRACE("(%p)\n", This); > + > + EnterCriticalSection(&This->lock); > + hr = IStream_Seek(This->stream, dlibMove, dwOrigin, plibNewPosition); > + LeaveCriticalSection(&This->lock); > + > + return hr; > +} The IWICStream needs to have an independent position from the underlying stream. Also, why not just forward to InitializeFromIStreamRegion?

1 0

Re: [1/3] user32/tests: Comment-out PostQuitMessage (causes tests skip)
by Marvin May 28, 2012

May 28, 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=18630 Your paranoid android. === W7PROX64 (32 bit dialog) === dialog.c:1373: Test failed: Dialog should not be visible. === TEST64_W7SP1 (32 bit dialog) === dialog.c:1373: Test failed: Dialog should not be visible. === W7PROX64 (64 bit dialog) === dialog.c:1373: Test failed: Dialog should not be visible. === TEST64_W7SP1 (64 bit dialog) === dialog.c:1373: Test failed: Dialog should not be visible.

1 0

Re: d3dx9_36/tests: Add tests for D3DXCreatePolygon
by Marvin May 27, 2012

May 27, 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=18615 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

func or pFunc in tests ?
by GOUJON Alexandre May 27, 2012

May 27, 2012

Hi, I'm planning to add a test in the wine test suite and I noticed a difference. Some tests call directly the function by its name (i.e. GetWindowsDirectory, CreateFileA, CloseHandle...) while others declare a pointer to the function (prefixing its name by 'p' and followed by a capital letter) retrieved via GetProcAddress. I know that tests have been written by lots of different people at different times and the general rule is "follow the style of the test file to be consistent" but here, both styles exist in the same file (kernel32/tests/volume.c). Is there any rule concerning using func over pFunc ? Is it related to the module it comes from ? Thanks

2 2

[website] Logo license? Usable in a propritary App?
by André Hentschel May 25, 2012

May 25, 2012

Hey, they use the "old" WineHQ Logo in this 99 Cent App: https://play.google.com/store/apps/details?id=com.appdevandroid.framework.w… Is that ok? If not, could the creater please contact them. The Icon could be misleading. -- Best Regards, André Hentschel

1 0

Fwd: [Freerdp-devel] WinPR: Windows Portable Runtime
by Pau Garcia i Quiles May 25, 2012

May 25, 2012

FYI ---------- Forwarded message ---------- From: Marc-André Moreau <marcandre.moreau(a)gmail.com> Date: Fri, May 25, 2012 at 3:04 AM Subject: [Freerdp-devel] WinPR: Windows Portable Runtime To: freerdp-devel <freerdp-devel(a)lists.sourceforge.net> Dear FreeRDP community, I have an announcement to make regarding a new spin-off project which I've been preparing for a while. Please read as this will set the tone of future development :) You can find most current WinPR development work on the winpr branch: https://github.com/FreeRDP/FreeRDP/tree/winpr WinPR is a spin-off project of FreeRDP which aims at providing a portable implementation of important portions of the Windows API. Just like FreeRDP, WinPR is released under the Apache license. Unlike Wine, WinPR does not provide binary compatibility, and does not require applications to be built for Windows. Instead, WinPR provides API compatibility for applications targeting non-Windows environments. When on Windows, the original native API is being used instead of the equivalent WinPR implementation, without having to modify the code using it. WinPR is the result of long and thoughtful process that came up after years of FreeRDP development. RDP, as you know, is a protocol designed by Microsoft and is primarily “Windows to Windows”. In many instances, protocol messages rely heavily on Windows-specific APIs which have no direct equivalent on other operating systems. For instance, core graphical messages are based on GDI, network level authentication makes use of the Microsoft SSPI authentication modules (CredSSP, NTLM), and terminal server gateway makes use of both SSPI and MSRPC. That’s not even mentioning all the effort that went into mapping keyboard systems and time zones. Developing FreeRDP is in many ways all about implementing Windows APIs outside of Windows. Immense efforts have gone into the implementation of such features, to the point where they begin having value outside of FreeRDP itself. At this point, one of the most valuable part of WinPR is the set of SSPI modules. Various NTLM implementations exist, all with different interfaces, but the WinPR implementation is a direct replacement of the original. This is an advantage because the API is already well documented, with expected inputs and outputs. FreeRDP can also optionally build against the native SSPI modules when on Windows. Making this code easily reusable to any one means that application developers now have an easy way of porting their applications to make use of the Windows authentication architecture. WinPR is also a response to a recurrent problem in FreeRDP development: the proliferation of custom helpers and utility functions. While those are useful, they often need to be modified and updated to meet new requirements, causing frequent API changes. Breaking the API regularly obviously makes a lot of developers unhappy. By choosing to implement an existing and mature API, we can effectively get rid of the core of the problem. If a certain API has been used for years and it fits the needs of most people, you are less likely to need to break it yourself. Besides the argument of API stability, there is another huge advantage in using the Windows API over custom utility functions: the ability to easily share code with other projects that aim at implementing the same API. For instance, the SSPI modules currently developed in WinPR are of high interest to the ReactOS project. If the code was filled with custom utility functions, it would be much harder to use outside of FreeRDP, hindering such collaboration opportunities. For instance, instead of wrapping calls to MultiByteToWideChar() in a custom unicode conversion utility, we can use MultiByteToWideChar() as the utility function and provide an implementation on non-Windows systems. As a general rule in WinPR, if a utility function can be replaced by a part of the Windows API, then the Windows API will have precedence. Otherwise, a utility method can be used, keeping in mind the downsides of it. WinPR is also designed to be as modular as possible, using the MinWin architecture as a reference. MinWin is a refactoring effort of the Windows API which is more cleaner and comprehensive than the original. The API has been separated into logical sets, each with a DLL. Not a lot of documentation is available online about MinWin, but one can find its structure in the MSDN article “Windows API Sets”: http://msdn.microsoft.com/en-us/library/hh802935/ Just like MinWin, WinPR aims at being minimalistic and modular, such that one can have fine grained control over what is to be used. For projects making use of only a small amounts of WinPR, it should be possible to depend only on the minimum required. At last, why not simply use Wine or code from other projects like ReactOS or Samba? In all of these cases, there are both licensing and architectural problems which make it fairly hard for us to use in FreeRDP. For instance, Wine provides binary compatibility, and it’s not easy for a native Linux application to make use of parts of it without being built for Windows. Samba has an interesting MSRPC implementation, but it’s a fairly big dependency, without counting the fact that we can forget about portability on mobile platforms like Android and iOS. Unfortunately, none of these provide a highly portable implementation of the Windows API in the way we would like and under a license which is suitable to us, justifying the existence of WinPR. Through WinPR, investment done in FreeRDP development will take a new life and become even more valuable. We will open new doors to even higher levels of interoperability. We will foster collaboration with other projects following similar goals and reach new heights at an increasingly faster pace. Stay tuned, you will be amazed! ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Freerdp-devel mailing list Freerdp-devel(a)lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/freerdp-devel -- Pau Garcia i Quiles http://www.elpauer.org (Due to my workload, I may need 10 days to answer)

1 0

Re: [5/5] propsys: Implement IPropertyStore::GetCount.
by Marvin May 24, 2012

May 24, 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=18573 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [4/5] propsys: Implement IPropertyStore::SetValue and GetValue.
by Marvin May 24, 2012

May 24, 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=18572 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: gdiplus: Reimplement GdipIsEmptyRegion.
by Dmitry Timoshkov May 24, 2012

May 24, 2012

Hello, I'm surprised that such a trivial patch wasn't accepted yet. But just in case it matters, current implementation doesn't work for paths and combined/complex regions. -- Dmitry.

2 2

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 22, 2012

May 22, 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 22, 2012

May 22, 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