July 2008 - Wine-devel - list.winehq.org

IWineD3DDeviceImpl_SetRenderState
by Chris Ahrendt 28 Jul '08

28 Jul '08

Attached to this note is a patch I have been working on for the past few days to finish out the above function. What I did was use MSDN for the definition : /***** * Get / Set Render States * TODO: Verify against dx9 definitions * Direct X 9 Definition: Parameters State [in] Device state variable that is being modified. This parameter can be any member of the D3DRENDERSTATETYPE enumerated type. Value[in] New value for the device render state to be set. The meaning of this parameter is dependent on the value specified for State. For example, if State were D3DRS_SHADEMODE, the second parameter would be one member of the D3DSHADEMODE enumerated type. Return Values If the method succeeds, the return value is D3D_OK. D3DERR_INVALIDCALL is returned if one of the arguments is invalid. Requirements Header: Declared in D3D9.h should I open a bug and then post this to the patches list... Please let me know what you think. The Following States have no rules for their valid values associated with them as far as I can find. WINED3DRS_BLENDOPALPHA: WINED3DRS_DEPTHBIAS: WINED3DRS_SRGBWRITEENABLE: WINED3DRS_BLENDFACTOR: WINED3DRS_COLORWRITEENABLE1: WINED3DRS_COLORWRITEENABLE2: WINED3DRS_COLORWRITEENABLE3: WINED3DRS_ADAPTIVETESS_X: WINED3DRS_ADAPTIVETESS_Y: WINED3DRS_ADAPTIVETESS_Z: WINED3DRS_ADAPTIVETESS_W: WINED3DRS_SLOPESCALEDEPTHBIAS: WINED3DRS_TWEENFACTOR: WINED3DRS_COLORWRITEENABLE: WINED3DRS_POINTSIZE_MAX: WINED3DRS_WRAP0: WINED3DRS_WRAP1: WINED3DRS_WRAP2: WINED3DRS_WRAP3: WINED3DRS_WRAP4: WINED3DRS_WRAP5: WINED3DRS_WRAP6: WINED3DRS_WRAP7: WINED3DRS_WRAP8: WINED3DRS_WRAP9: WINED3DRS_WRAP10: WINED3DRS_WRAP11: WINED3DRS_WRAP12: WINED3DRS_WRAP13: WINED3DRS_WRAP14: WINED3DRS_WRAP15: WINED3DRS_STENCILREF: WINED3DRS_FOGSTART: WINED3DRS_FOGEND: WINED3DRS_FOGDENSITY: WINED3DRS_CLIPPLANEENABLE: WINED3DRS_POINTSIZE: WINED3DRS_POINTSIZE_MIN: WINED3DRS_POINTSCALE_A: WINED3DRS_POINTSCALE_B: WINED3DRS_POINTSCALE_C: Chris --- device_old.c 2008-07-25 11:42:25.000000000 -0400 +++ device.c 2008-07-26 21:07:45.000000000 -0400 @@ -34,6 +34,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->adapter->gl_info +#define D3DBLEND_INVSRCCOLOR 4 +#define WINED3DDMT_ENABLE 0 +#define WINED3DDMT_DISABLE 1 +#define WINED3DBLEND_INVSRCCOLOR2 17 +#define WINED3DBLEND_SRCCOLOR2 16 /* Define the default light parameters as specified by MSDN */ const WINED3DLIGHT WINED3D_default_light = { @@ -3249,14 +3254,280 @@ /***** * Get / Set Render States * TODO: Verify against dx9 definitions - *****/ + * + + Direct X 9 Definition: + Parameters + State + [in] Device state variable that is being modified. This parameter + can be any member of the D3DRENDERSTATETYPE enumerated type. + Value[in] New value for the device render state to be set. + The meaning of this parameter is dependent on the value specified + for State. For example, if State were D3DRS_SHADEMODE, the second + parameter would be one member of the D3DSHADEMODE enumerated type. + + Return Values + + If the method succeeds, the return value is D3D_OK. D3DERR_INVALIDCALL is returned if one of the arguments is invalid. +Requirements + +Header: Declared in D3D9.h + + ****/ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderState(IWineD3DDevice *iface, WINED3DRENDERSTATETYPE State, DWORD Value) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; DWORD oldValue = This->stateBlock->renderState[State]; TRACE("(%p)->state = %s(%d), value = %d\n", This, debug_d3drenderstate(State), State, Value); + + switch(State) + { + case WINED3DRS_SEPARATEALPHABLENDENABLE: + WINED3DRS_TWOSIDEDSTENCILMODE: + WINED3DRS_ENABLEADAPTIVETESSELLATION: + WINED3DRS_ANTIALIASEDLINEENABLE: + WINED3DRS_SCISSORTESTENABLE: + WINED3DRS_INDEXEDVERTEXBLENDENABLE: + WINED3DRS_MULTISAMPLEANTIALIAS: + WINED3DRS_POINTSPRITEENABLE: + WINED3DRS_POINTSCALEENABLE: + WINED3DRS_NORMALIZENORMALS: + WINED3DRS_LOCALVIEWER: + WINED3DRS_COLORVERTEX: + WINED3DRS_CLIPPING: + WINED3DRS_ZENABLE: + WINED3DRS_STENCILENABLE: + WINED3DRS_RANGEFOGENABLE: + WINED3DRS_ALPHABLENDENABLE: + WINED3DRS_DITHERENABLE: + WINED3DRS_ZWRITEENABLE: + WINED3DRS_ALPHATESTENABLE: + WINED3DRS_FOGENABLE: + WINED3DRS_SPECULARENABLE: + WINED3DRS_LIGHTING: + WINED3DRS_LASTPIXEL: + if ((Value == TRUE) || + (Value == FALSE)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_FILLMODE: + if ((Value == WINED3DFILL_POINT) || + (Value == WINED3DFILL_WIREFRAME) || + (Value == WINED3DFILL_SOLID)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_SHADEMODE: + if ((Value == WINED3DSHADE_FLAT) || + (Value == WINED3DSHADE_GOURAUD) || + (Value == WINED3DSHADE_PHONG)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_SRCBLENDALPHA: + case WINED3DRS_DESTBLENDALPHA: + case WINED3DRS_DESTBLEND: + case WINED3DRS_SRCBLEND: + if ((Value == WINED3DBLEND_ZERO) || + (Value == WINED3DBLEND_ONE) || + (Value == WINED3DBLEND_SRCCOLOR) || + (Value == WINED3DBLEND_INVSRCCOLOR) || + (Value == WINED3DBLEND_SRCALPHA) || + (Value == WINED3DBLEND_INVSRCALPHA) || + (Value == WINED3DBLEND_DESTALPHA) || + (Value == WINED3DBLEND_INVDESTALPHA) || + (Value == WINED3DBLEND_DESTCOLOR) || + (Value == WINED3DBLEND_INVDESTCOLOR) || + (Value == WINED3DBLEND_SRCALPHASAT) || + (Value == WINED3DBLEND_BOTHSRCALPHA) || + (Value == WINED3DBLEND_BOTHINVSRCALPHA) || + (Value == WINED3DBLEND_BLENDFACTOR) || + (Value == WINED3DBLEND_INVBLENDFACTOR) || + (Value == WINED3DBLEND_SRCCOLOR2) || + (Value == WINED3DBLEND_INVSRCCOLOR2)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_CULLMODE: + if ((Value == WINED3DCULL_NONE) || + (Value == WINED3DCULL_CW) || + (Value == WINED3DCULL_CCW)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_CCW_STENCILFUNC: + WINED3DRS_STENCILFUNC: + WINED3DRS_ALPHAFUNC: + WINED3DRS_ZFUNC: + if ((Value == WINED3DCMP_NEVER) || + (Value == WINED3DCMP_LESS) || + (Value == WINED3DCMP_EQUAL) || + (Value == WINED3DCMP_LESSEQUAL) || + (Value == WINED3DCMP_GREATER) || + (Value == WINED3DCMP_NOTEQUAL) || + (Value == WINED3DCMP_GREATEREQUAL) || + (Value == WINED3DCMP_ALWAYS)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_ALPHAREF: + /* Valid values are between 0 and FF */ + if ((Value >= 0) || + (Value <= 0xFF)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_FOGCOLOR: + /* Valid Values are between 0 and FFFF (4 bytes alpha, red, green, and blue)) */ + if ((Value >= 0) || + (Value <= 0xFFFF)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_FOGVERTEXMODE: + WINED3DRS_FOGTABLEMODE: + if ((Value == WINED3DFOG_NONE) || + (Value == WINED3DFOG_EXP) || + (Value == WINED3DFOG_EXP2) || + (Value == WINED3DFOG_LINEAR)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_CCW_STENCILFAIL: + WINED3DRS_CCW_STENCILZFAIL: + WINED3DRS_CCW_STENCILPASS: + WINED3DRS_STENCILPASS: + WINED3DRS_STENCILZFAIL: + WINED3DRS_STENCILFAIL: + if ((Value == WINED3DSTENCILOP_KEEP) || + (Value == WINED3DSTENCILOP_ZERO) || + (Value == WINED3DSTENCILOP_REPLACE) || + (Value == WINED3DSTENCILOP_INCRSAT) || + (Value == WINED3DSTENCILOP_DECRSAT) || + (Value == WINED3DSTENCILOP_INVERT) || + (Value == WINED3DSTENCILOP_INCR) || + (Value == WINED3DSTENCILOP_DECR)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_MULTISAMPLEMASK: + WINED3DRS_AMBIENT: + WINED3DRS_TEXTUREFACTOR: + WINED3DRS_STENCILWRITEMASK: + WINED3DRS_STENCILMASK: + if ((Value >= 0) || + (Value <=0xFFFFFFFF)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_SPECULARMATERIALSOURCE: + WINED3DRS_AMBIENTMATERIALSOURCE: + WINED3DRS_EMISSIVEMATERIALSOURCE: + WINED3DRS_DIFFUSEMATERIALSOURCE: + if ((Value == WINED3DMCS_MATERIAL) || + (Value == WINED3DMCS_COLOR1) || + (Value == WINED3DMCS_COLOR2)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_VERTEXBLEND: + if ((Value == WINED3DVBF_DISABLE) || + (Value == WINED3DVBF_1WEIGHTS) || + (Value == WINED3DVBF_2WEIGHTS) || + (Value == WINED3DVBF_3WEIGHTS) || + (Value == WINED3DVBF_TWEENING) || + (Value == WINED3DVBF_0WEIGHTS)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_PATCHEDGESTYLE: + if ((Value == WINED3DPATCHEDGE_DISCRETE) || + (Value == WINED3DPATCHEDGE_CONTINUOUS)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_DEBUGMONITORTOKEN: + if ((Value == WINED3DDMT_ENABLE) || + (Value == WINED3DDMT_DISABLE)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_BLENDOP: + if ((Value == WINED3DBLENDOP_ADD) || + (Value == WINED3DBLENDOP_SUBTRACT) || + (Value == WINED3DBLENDOP_REVSUBTRACT) || + (Value == WINED3DBLENDOP_MIN) || + (Value == WINED3DBLENDOP_MAX)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_NORMALDEGREE: + WINED3DRS_POSITIONDEGREE: + if ((Value == WINED3DDEGREE_LINEAR) || + (Value == WINED3DDEGREE_QUADRATIC) || + (Value == WINED3DDEGREE_CUBIC) || + (Value == WINED3DDEGREE_QUINTIC)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_MINTESSELLATIONLEVEL: + WINED3DRS_MAXTESSELLATIONLEVEL: + if ((Value == WINED3DDEGREE_LINEAR) || + (Value == WINED3DDEGREE_QUADRATIC) || + (Value == WINED3DDEGREE_CUBIC) || + (Value == WINED3DDEGREE_QUINTIC)) break; + return WINED3DERR_INVALIDCALL; + break; + + case WINED3DRS_BLENDOPALPHA: + WINED3DRS_DEPTHBIAS: + WINED3DRS_SRGBWRITEENABLE: + WINED3DRS_BLENDFACTOR: + WINED3DRS_COLORWRITEENABLE1: + WINED3DRS_COLORWRITEENABLE2: + WINED3DRS_COLORWRITEENABLE3: + WINED3DRS_ADAPTIVETESS_X: + WINED3DRS_ADAPTIVETESS_Y: + WINED3DRS_ADAPTIVETESS_Z: + WINED3DRS_ADAPTIVETESS_W: + WINED3DRS_SLOPESCALEDEPTHBIAS: + WINED3DRS_TWEENFACTOR: + WINED3DRS_COLORWRITEENABLE: + WINED3DRS_POINTSIZE_MAX: + WINED3DRS_WRAP0: + WINED3DRS_WRAP1: + WINED3DRS_WRAP2: + WINED3DRS_WRAP3: + WINED3DRS_WRAP4: + WINED3DRS_WRAP5: + WINED3DRS_WRAP6: + WINED3DRS_WRAP7: + WINED3DRS_WRAP8: + WINED3DRS_WRAP9: + WINED3DRS_WRAP10: + WINED3DRS_WRAP11: + WINED3DRS_WRAP12: + WINED3DRS_WRAP13: + WINED3DRS_WRAP14: + WINED3DRS_WRAP15: + WINED3DRS_STENCILREF: + WINED3DRS_FOGSTART: + WINED3DRS_FOGEND: + WINED3DRS_FOGDENSITY: + WINED3DRS_CLIPPLANEENABLE: + WINED3DRS_POINTSIZE: + WINED3DRS_POINTSIZE_MIN: + WINED3DRS_POINTSCALE_A: + WINED3DRS_POINTSCALE_B: + WINED3DRS_POINTSCALE_C: + break; + Default: + return WINED3DERR_INVALIDCALL; + } + This->updateStateBlock->changed.renderState[State] = TRUE; This->updateStateBlock->renderState[State] = Value;

6 19

Re: dpnet: #3 Add stubbed DirectPlay8Peer:Close
by Alexandre Julliard 28 Jul '08

28 Jul '08

Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> writes: > + > static const IDirectPlay8PeerVtbl DirectPlay8Peer_Vtbl = > { > IDirectPlay8PeerImpl_QueryInterface, > IDirectPlay8PeerImpl_AddRef, > IDirectPlay8PeerImpl_Release, > IDirectPlay8PeerImpl_Initialize, > - IDirectPlay8PeerImpl_EnumServiceProviders > + IDirectPlay8PeerImpl_EnumServiceProviders, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + NULL, > + IDirectPlay8PeerImpl_Close Don't do that, partial vtables lead to hard to find crashes. The vtable should be completely initialized from the start with stub functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: shdocvw: rudimentary implementation of CLSID_InternetShortcut
by Alexandre Julliard 28 Jul '08

28 Jul '08

"Damjan Jovanovic" <damjan.jov(a)gmail.com> writes: > +#define IMPL(class, member, pointer) ((class*) (((char*) pointer) - offsetof(class, member))) Please don't invent yet another macro for this. Use inline functions instead. > +typedef struct > +{ > + IUnknown unknown; > + IUniformResourceLocatorA uniformResourceLocatorA; > + IUniformResourceLocatorW uniformResourceLocatorW; > + IPersistFile persistFile; There's no need for an explicit IUnknown vtable. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: dlls/winedos/vxd.c
by Francois Gouget 28 Jul '08

28 Jul '08

On Mon, 28 Jul 2008, Gerald Pfeifer wrote: > Seems like I'm losing the argument on the GCC side, so we'll really > need to address those six or so warnings in our codebase by adding > return statements I guess. Hopefully they won't add a check complaining that this is an unreachale statement next. Are all the other cases unreachable too? static DWORD CALLBACK timer_thread( void *arg ) { DWORD *system_time = arg; for (;;) { *system_time = GetTickCount(); Sleep( 55 ); } return 0; } -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ The software said it requires Win95 or better, so I installed Linux.

1 0

Re: d3dx8: patch1: Implement D3DXBoxBoundProbe
by H. Verbeet 28 Jul '08

28 Jul '08

2008/7/27 David Adam <david.adam.cnrs(a)gmail.com>: > + ortho = D3DXVec3Dot(praydirection, &normal[i]); > + if ( ortho ) > + { > + t = D3DXVec3Dot(praydirection, &normal[i]) / ortho; This doesn't make much sense, t will always be close to zero this way. > + rayposition.x = -3.0f; rayposition.y = 1.0f; rayposition.z = -2.0f; > + result = D3DXBoxBoundProbe(&bottom_point, &top_point, &rayposition, &raydirection); > + ok(result == TRUE, "expected TRUE, received FALSE\n"); This succeeds because rayposition lies on one of the faces of the box. I think it would be useful to also add a test where rayposition lies outside the box but where the ray still intersects the box. In general, also note that the fact that the box is always axis-aligned means the normal is always 0 in two of the three directions. This simplifies the equations a bit.

1 1

Re: [5/5] WineD3D: Implement an ARB_fragmen_program fixed function pipeline
by H. Verbeet 28 Jul '08

28 Jul '08

2008/7/27 Stefan Dösinger <stefan(a)codeweavers.com>: > Unfortunately, even despite the preparations in the last patches, this patch > is still kinda huge because I have to replace all the fragment processing at > once. > This enables the replacement pretty much unconditionally... do we want that? It also might make sense to give this its own file.

2 2

Re: winhttp: tests/winhttp.c: Add test for WinHttpSendRequest
by Hans Leidekker 28 Jul '08

28 Jul '08

On Friday 25 July 2008 22:13:18 Zac Brown wrote: > +#include <wchar.h> > > #include <windef.h> > #include <winbase.h> > +#include <windows.h> You shouldn't need these. -Hans

2 1

Re: crypt32: Add test showing only file header is checked for cabinet files
by Detlef Riekenberg 27 Jul '08

27 Jul '08

On Fr, 2008-07-25 at 11:28 -0700, Juan Lang wrote: > + /* Create a file with just the .cab header 'MSCF' */ > + file = CreateFileW( CreateFileW is not supported on win9x. (returned NULL with ERROR_CALL_NOT_IMPLEMENTED) I have a Patch ready for the other use of CreateFileW in dlls/crypt32/tests/sip.c -- By by ... Detlef

1 0

Re: wined3d: universal surface convertor function for unsigned integer color formats(5th attempt)
by Philip Nilsson 27 Jul '08

27 Jul '08

On Thu, Jul 24, 2008 at 08:14:40PM +0400, Victor Eremin wrote: > Supports conversion between most of "unsigned color" argb/xrgb > surface formats (D3DFMT_A8R8G8B8, D3DFMT_A8R3G3B2, etc), and > "luminosity" color formats (D3DFMT_L8, etc), > excluding D3DFMT_A16R16G16B16, D3DFMT_A8P8, D3DFMT_P8 and D3DFMT_A1. > luminosity to argb/xrgb (and vice versa) conversions are not supported > dlls/wined3d/surface_base.c | 218 ++++++++++++++++++++++++++++++++++++++- I think it would be a better idea to put most of the functions in utils.c, as they are utilities, and may have utility in other places (for example argb_to_fmt does something similar, although I'm not sure if more format conversion is neccessary.) > +inline BYTE getMaskShift(DWORD mask){ Most functions here do not use camelCase. > +void mask_erase(DWORD dstMask, BYTE pixelSize, I'd make all functions static that have no use outside their file to get nicer warnings (function unused) and smaller binaries. I wonder how static and inline interacts... > +/* > + * Warning: this won't convert all formats > + */ The FIXMEs should be enough. > struct d3dfmt_convertor_desc convertors[] = { > - {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f}, > + {WINED3DFMT_R32F, WINED3DFMT_R16F, convert_r32f_r16f} > }; I think my neckbeard just caught fire! A lot of tests would be nice (although I guess most of the functionality is already tested.) I hope this is somewhat helpful.

1 0

Bizarre idea: creating our own extension to msi for cross-platform installers
by Scott Ritchie 27 Jul '08

27 Jul '08

Just a crazy thought, but... What if we created a standard for passing some sort of wine-specific metadata in an MSI file? Windows would ignore it, but application developers could use it to include some helpful Linux-specific Wine instructions like what windows version to use, a custom .desktop file, or even instructions to install into a completely independent Wine prefix. This way, a single .msi file could be a true universal installer for both Windows machines and Linux machines. Moreover, there'd be less of a need to create custom Wine packages for applications like Picassa since a lot of that functionality would be abstracted into Wine itself. Thoughts? Thanks, Scott Ritchie

4 4