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

Re: d3dx9_36: Equality between floats is too strict.
by Marvin May 12, 2012

May 12, 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=18337 Your paranoid android. === WXPPROSP3 (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === W2K3R2SESP2 (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === WVISTAADM (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === W2K8SE (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === W7PRO (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === W7PROX64 (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === TEST64_W7SP1 (32 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === W7PROX64 (64 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0 === TEST64_W7SP1 (64 bit math) === math.c:2343: Test failed: 0-0: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 1-1: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 2-4: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 3-9: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 4-16: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 5-25: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 6-36: D3DXSHAdd() failed, got 0.000000, expected 0.0 math.c:2343: Test failed: 7-49: D3DXSHAdd() failed, got 0.000000, expected 0.0

1 0

Re: [2/8] d3dx9: Check the size of a DDS file in D3DXGetImageInfoFromFileInMemory.
by Stefan Dösinger May 12, 2012

May 12, 2012

Am Mittwoch, 9. Mai 2012, 23:32:05 schrieb Józef Kucia: > + *pitch = width * format_desc->bytes_per_pixel; > + *size = *pitch * height; Usually surface pitches are either 4 or 8 byte aligned(depending on the API and pool). I recommend to write some tests for this. The most likely problematic formats are D3DFMT_P8, any 16 bit format like R5G6B5 and 24 bit R8G8B8. Maybe you're supposed to honor the pitch_or_linear_size member of the DDSURFACEDESC.

3 5

Re: [PATCH 1/3] user32: Added GetMenuBarInfo implementation
by Alexandre Julliard May 12, 2012

May 12, 2012

Piotr Caban <piotr(a)codeweavers.com> writes: > + __TRY > + { > + mbi.cbSize = pmbi->cbSize; > + if (mbi.cbSize == sizeof(MENUBARINFO)) > + memcpy(pmbi, &mbi, sizeof(MENUBARINFO)); > + } > + __EXCEPT_PAGE_FAULT > + { > + SetLastError(ERROR_NOACCESS); > + return FALSE; > + } > + __ENDTRY Do you really have an app that requires an exception handler? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [2/5] d3dx9: Forward D3DXSaveSurfaceToFileA to D3DXSaveSurfaceToFileW.
by Józef Kucia May 11, 2012

May 11, 2012

On Wed, May 2, 2012 at 2:55 PM, Józef Kucia <joseph.kucia(a)gmail.com> wrote: > --- > dlls/d3dx9_36/surface.c | 24 ++++++++++++++++++++---- > 1 files changed, 20 insertions(+), 4 deletions(-) > > diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c > index 44d4e06..70627fd 100644 > --- a/dlls/d3dx9_36/surface.c > +++ b/dlls/d3dx9_36/surface.c > @@ -1364,11 +1364,27 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(LPDIRECT3DSURFACE9 pDestSurface, > } > > > -HRESULT WINAPI D3DXSaveSurfaceToFileA(LPCSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, > - LPDIRECT3DSURFACE9 pSrcSurface, const PALETTEENTRY* pSrcPalette, const RECT* pSrcRect) > +HRESULT WINAPI D3DXSaveSurfaceToFileA(LPCSTR dst_filename, D3DXIMAGE_FILEFORMAT file_format, > + IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect) > { > - FIXME("(%p, %d, %p, %p, %p): stub\n", pDestFile, DestFormat, pSrcSurface, pSrcPalette, pSrcRect); > - return D3DERR_INVALIDCALL; > + int len; > + LPWSTR filename; > + HRESULT hr; > + > + TRACE("(%s, %d, %p, %p, %p): relay\n", > + wine_dbgstr_a(dst_filename), file_format, src_surface, src_palette, src_rect); > + > + if (!dst_filename) return D3DERR_INVALIDCALL; > + > + len = MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, NULL, 0); > + filename = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR)); > + if (!filename) return E_OUTOFMEMORY; > + MultiByteToWideChar(CP_ACP, 0, dst_filename, -1, filename, len); > + > + hr = D3DXSaveSurfaceToFileW(filename, file_format, src_surface, src_palette, src_rect); > + > + HeapFree(GetProcessHeap(), 0, filename); > + return hr; > } > > HRESULT WINAPI D3DXSaveSurfaceToFileW(LPCWSTR pDestFile, D3DXIMAGE_FILEFORMAT DestFormat, > -- > 1.7.8.6 > This mail is the lost mail from 2nd May. Please ignore it.

1 0

Re: [PATCH 1/2 resend] mshtml.idl: Added DispHTMLHistory declaration
by Jacek Caban May 11, 2012

May 11, 2012

There must have been some problem with mail servers. These mails were sent last week and should replace already committed patches. The fix from try 2 (fixing tests on old IEs) is also already committed. Cheers, Jacek

1 0

Re: [1/8] d3dx9: Add missing pixel formats.
by Matteo Bruni May 11, 2012

May 11, 2012

2012/5/9 Józef Kucia <joseph.kucia(a)gmail.com>: > diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c > index 4dbf44c..ad8a6ea 100644 > --- a/dlls/d3dx9_36/util.c > +++ b/dlls/d3dx9_36/util.c > @@ -62,6 +62,7 @@ static const PixelFormatDesc formats[] = > {D3DFMT_G16R16, {0, 16, 16, 0}, { 0, 0, 16, 0}, 4, 1, 1, 4, FORMAT_ARGB, NULL, NULL }, > {D3DFMT_A8, {8, 0, 0, 0}, { 0, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, NULL, NULL }, > {D3DFMT_A8L8, {8, 8, 0, 0}, { 8, 0, 0, 0}, 2, 1, 1, 2, FORMAT_ARGB, la_from_rgba, la_to_rgba}, > + {D3DFMT_A4L4, {4, 4, 0, 0}, { 4, 0, 0, 0}, 1, 1, 1, 1, FORMAT_ARGB, la_from_rgba, la_to_rgba}, > {D3DFMT_DXT1, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 8, FORMAT_ARGB, NULL, NULL }, > {D3DFMT_DXT2, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, > {D3DFMT_DXT3, {0, 0, 0, 0}, { 0, 0, 0, 0}, 1, 4, 4, 16, FORMAT_ARGB, NULL, NULL }, I guess it would make sense to add all the new pixel formats to the table, assuming it doesn't break the tests or other stuff.

3 2

Re: [PATCH 3/4] dmusic: COM cleanup of IReferenceClock.
by Nikolay Sivov May 11, 2012

May 11, 2012

On 5/11/2012 09:19, Christian Costa wrote: > > diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h > index 73a05d4..96334c9 100644 > --- a/dlls/dmusic/dmusic_private.h > +++ b/dlls/dmusic/dmusic_private.h > @@ -167,13 +167,14 @@ extern HRESULT WINAPI DMUSIC_CreateDMSynthPort(REFIID riid, LPVOID *ppobj, LPUNK > * IReferenceClockImpl implementation structure > */ > struct IReferenceClockImpl { > - /* IUnknown fields */ > - const IReferenceClockVtbl *lpVtbl; > - LONG ref; > + /* IUnknown fields */ > + IReferenceClock IReferenceClock_iface; > + const IReferenceClockVtbl *lpVtbl; You forgot to remove that, right? > + LONG ref; > > >

2 1

Re: Vincent Povirk : windowscodecs: Add wrapper functions for IWICPalette methods.
by Charles Davis May 11, 2012

May 11, 2012

On May 10, 2012, at 1:17 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 2fc7cdc93f6dc8ed67498b74193423c44e5bb770 > URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fc7cdc93f6dc8ed67498b741… > > Author: Vincent Povirk <vincent(a)codeweavers.com> > Date: Tue May 8 10:49:22 2012 -0500 > > windowscodecs: Add wrapper functions for IWICPalette methods. I have to say, these patches all seem really mechanical. Correct me if I'm wrong, but I think MIDL has an option to generate the proxy wrappers automatically. Even if it doesn't, I'm sure this would be a good feature to add to widl (if we don't already have it) so we don't have to laboriously write and maintain each and every one of the proxy wrappers. Chip

2 1

Re: [PATCH 2/2 try 2] mshtml: Added IHTMLWindow2::get_history implementation
by Marvin May 10, 2012

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

1 0

GSoC Joystick Configuration Tools
by Lucas Zawacki May 10, 2012

May 10, 2012

Hello all, I'll use this thread to post information and ask questions regarding my GSoC project. First there's a wiki which aggregates some information and lists tasks I'm working on: http://lfzawacki.heroku.com/wine/published/HomePage Then there's a github repo: https://github.com/lfzawacki/wine-joysticks In the repository you'll find the different tools I'll be implementing. They can be easily built and tested, even before they make it into wine. At the moment there's an intial version of the command line joystick tester. This tool is useful for listing connected joysticks, testing if they work correctly in wine, testing axis remapping, watching for dinput trace messages, etc... It's also the basis for the joystick testing GUI. I'll start cleaning up, splitting this code and commiting it to wine next week. For now I'll make a similar tool to this one that tests force feedback. I'll try to make it in the style of the Linux fftest program, but using the dinput interfaces so that a user can test the differences. Cheers, Lucas

2 2