August 2010 - Wine-devel - list.winehq.org

Re: [PATCH 1/6] d3dx9_36/tests: Added HLSL test suite.
by Henri Verbeet 06 Aug '10

06 Aug '10

On 5 August 2010 00:05, Travis Athougies <iammisc(a)gmail.com> wrote: > +#define CINTERFACE Why do you need this? > +#include <d3d9.h> d3d9.h should be implied by d3dx9.h > +#include <assert.h> > +#include <stdio.h> I don't think you need these either. > +struct vertex > +{ > + float x, y, z; > + float tx, ty; > +}; > + > +const struct vertex quad_vertices[4] = { > + {-1, -1, 0, 0, 1}, > + {-1, 1, 0, 0, 0}, > + {1, -1, 0, 1, 1}, > + {1, 1, 0, 1, 0} > +}; Those aren't floating point values. Also, please use consistent formatting. > +const struct vertex quad_vertices[4] = { ... > +static IDirect3DVertexBuffer9 *quad_geometry; > +static IDirect3DVertexShader9 *vshader_passthru; > +static IDirect3DVertexDeclaration9 *vdeclaration; > +static IDirect3DDevice9 *device; Why is all of that global? > + hres = IDirect3D9_CreateDevice(d3d9_ptr, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device_ptr); Please break long lines. I realize this particular one is probably somehow my fault because I added it back in 2005 with c26ad82e75e408c302c21228ef08c1af0482326c, and everyone has been (blindly) copying it since, but there are other examples like setup_device() as well. Use 120 as maximum line length, 100 to be safe. > + hres = IDirect3DVertexBuffer9_Lock(quad_geometry, 0, sizeof(quad_vertices), (void**)&temp_geometry_vertices, 0); You don't need that cast. > + hres = D3DXCompileShader(vshader_passthru_hlsl, strlen(vshader_passthru_hlsl), > + NULL, NULL, "vshader", "vs_1_1", 0, > + &compiled, &errors, 0); > + if(FAILED(hres)) > + { > + vshader_passthru = NULL; That doesn't make sense, vshader_passthru is already NULL at that point. > + hr = D3DXCompileShader(shader, strlen(shader), > + NULL, NULL, "test", profile, > + 0, &compiled, &errors, constants); > + ok (hr == D3D_OK, "Pixel shader %s compilation failed: %s\n", shader, (char*) (errors?ID3DXBuffer_GetBufferPointer(errors):"")); This casts away const. > diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h > index c8380bc..c54d27c 100644 > --- a/include/d3dx9shader.h > +++ b/include/d3dx9shader.h > @@ -296,6 +296,17 @@ HRESULT WINAPI D3DXAssembleShader(LPCSTR data, > LPD3DXBUFFER* shader, > LPD3DXBUFFER* error_messages); > > +HRESULT WINAPI D3DXCompileShader(LPCSTR src_data, > + UINT data_len, > + const D3DXMACRO* defines, > + LPD3DXINCLUDE include, > + LPCSTR function_name, > + LPCSTR profile, > + DWORD flags, > + LPD3DXBUFFER* shader, > + LPD3DXBUFFER* error_messages, > + LPD3DXCONSTANTTABLE* constant_table); > + This should be in a separate patch. The patch has some more issues, they shouldn't be hard to spot.

1 0

Re: [PATCH 2/5] gameux: Add stub of IGameStatisticsMgr implementation (try 2)
by Nikolay Sivov 06 Aug '10

06 Aug '10

On 8/3/2010 13:58, Mariusz Pluciński wrote: > --- > dlls/gameux/Makefile.in | 1 + > dlls/gameux/factory.c | 5 ++ > dlls/gameux/gamestatistics.c | 153 > ++++++++++++++++++++++++++++++++++++++++++ > dlls/gameux/gameux_private.h | 1 + > dlls/gameux/regsvr.c | 9 +++ > 5 files changed, 169 insertions(+), 0 deletions(-) > create mode 100644 dlls/gameux/gamestatistics.c > + TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); > + FIXME("stub\n"); > + return E_NOTIMPL; No need for duplicated traces, add one FIXME with full parameter output in it.

3 3

The WineAPI wiki.
by Max TenEyck Woodbury 06 Aug '10

06 Aug '10

I have started the WineAPI wiki at https://sourceforge.net/apps/mediawiki/wineapi/index.php?title=Main_Page Some issues have come up that may need to be discussed here. In particular, there is going to be an 'Overview' section for many articles and I think the information to fill it in should come from the wine source tree. Specifically, I'd like to create 'Overview.wiki' files to contain this information. - Max

3 12

Wine users with a CD-ROM drive, please test
by Joerg-Cyril.Hoehle＠t-systems.com 06 Aug '10

06 Aug '10

Hi, this is my second call for participation, as only Jeff Zaroyko responded to the first one. I wrote a testsuite for mcicda (play music from CD-ROM using the MCI). Wine's testbot job #4330 at https://testbot.winehq.org/JobDetails.pl?Key=4330 contains both a patch and binary of what I'd initially want to test about mcida.dll, solely lacking compatibility fixes that testing on YOUR machine will show to be necessary. Please download the executable or compile the patch and execute it in MS-Windows: mcicda_test.exe mcicda mcicda.c:270: CD length 69:23:66 mcicda.c:325: track #1 length 989547ms mcicda.c:375: track #1 length: 16m:29s:41frames mcicda.c:410: last track length: 03m:28s:19frames mcicda.c:418: last track position: 65m:57s:47frames mcicda: 112 tests executed (0 marked as todo, 0 failures), 0 skipped. BTW, I wrote patches to make all these tests succeed in Wine. Before submission, I'd appreciate some more test data. Thank you for your participation, Jörg Höhle

3 3

Re: wiki slightly broken still?
by David Gerard 06 Aug '10

06 Aug '10

[to list as well] On 3 August 2010 15:07, Dimi Paun <dimi(a)lattica.com> wrote: > On Tue, 2010-08-03 at 14:30 +0200, Alexandru Băluț wrote: >> How difficult would it be to use ReCaptcha? >> http://www.google.com/recaptcha > Hm, don't know. We could hack our version to support recaptcha, > but I'm not familiar with the code base, and I don't have the > time right now. But I can take patches if someone is willing > to do it. The MoinMoin developers consider TextCHA inherently superior and so have no interest in writing a reCaptcha interface: http://moinmo.in/FeatureRequests/ReCaptcha (Note also the problems people have had with TextCHA: it becomes too much work to write the questions and to answer the questions.) If someone wants reCaptcha in MoinMoin, it appears they will need to write it all themselves. - d.

2 1

[PATCH 5/6] d3dx9_36/tests: Added trigonometric functions test to HLSL test suite
by Joris Huizer 05 Aug '10

05 Aug '10

Hello Travis Athougies, In this patch, you have this code: + void *ret = NULL; //... + ret = HeapAlloc(GetProcessHeap(), 0, 4 * samples); + for(i = 0;i < 32;i++) { //... + memcpy((void*) (((DWORD) ret) + (4 * i)), lr.pBits, 4); //... + } I'm not sure, but I think this will cause 64-bit issues (truncating to a 32-bit value?) Even if it doesn't, it seems simpler (more readable) to use a char pointer instead of a void pointer, like + char *ret; //... + ret = HeapAlloc(GetProcessHeap(), 0, 4 * samples); //... + memcpy(ret + (4 * i), lr.pBits, 4); HTH, regards, Joris

2 1

GDB debugging on ARM
by André Hentschel 04 Aug '10

04 Aug '10

Hi, what is the best/easiest/fastest way to hack Wine so it does not start winedbg and i can debug it with gdb? my problem is that my WineARM works so far that it tries to run winedbg and uses its own handlers. but i want that not to happen of course it crashes somewhere and then tries to start winedbg... but winedbg is not really implemented yet on arm and its not yet time for it. i just want to debug on assembler level with gdb... "winedbg --gdb" is also not what i want. So my understanding is that Wine somewhere register its exception handlers, but i cant find that code to disable it. Anyone? -- Best Regards, André Hentschel

2 1

Re: [PATCH 07/10] ddraw: Allow creating back buffer for DirectX 1 interfaces. (try 3)
by Stefan Dösinger 04 Aug '10

04 Aug '10

Am 03.08.2010 um 21:26 schrieb Oldřich Jedlička: > DirectX 1 interface allowed creation of explicit back buffers, so move the > restrictive checks to DirectX 2+ implementations. Don't permit creating of > primary surface back buffer. The patch(as well as 9 and 10) look OK to me. Patch 6 is OK too. Patch 8 is missing a call to wined3d to tell it about the new backbuffer. (Apps will likely still work with the GDI renderer, but not the opengl ddraw renderer)

2 1

Vacation
by Alexandre Julliard 04 Aug '10

04 Aug '10

Folks, I'll be on vacation until the end of next week, so there won't be any commits for a while. That shouldn't prevent anybody from making progress, as we have seen during the recent code freeze ;-) The next release will be on Friday 20th. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 03/10] ddraw/tests: Add test for NULL/bad size of surface caps in CreateSurface. (try 3)
by Alexandre Julliard 04 Aug '10

04 Aug '10

Oldřich Jedlička <oldium.pro(a)seznam.cz> writes: > + __TRY > + { > + hr = IDirectDraw_CreateSurface(lpDD, NULL, &surf, NULL); > + todo_wine ok(hr == DDERR_INVALIDPARAMS, "IDirectDraw_CreateSurface didn't return 0x%08x, but 0x%08x\n", > + DDERR_INVALIDPARAMS, hr); > + } > + __EXCEPT_PAGE_FAULT > + { > + todo_wine ok(FALSE, "IDirectDraw_CreateSurface dereferenced NULL pointer\n"); > + } > + __ENDTRY You can't use Wine exception macros in tests. -- Alexandre Julliard julliard(a)winehq.org

4 3