wine-devel July 2008

wine-devel@winehq.org

135 participants
411 discussions

RE: [1/3] WineD3D: Use C bitfields to compact the ffp description
by Stefan Dösinger 28 Jul '08

28 Jul '08

Don't apply the patches yet, they break the d3d7 visual tests > -----Original Message----- > From: wine-patches-bounces(a)winehq.org [mailto:wine-patches- > bounces(a)winehq.org] On Behalf Of Stefan Dösinger > Sent: Monday, July 28, 2008 11:44 AM > To: wine-patches(a)winehq.org > Subject: [1/3] WineD3D: Use C bitfields to compact the ffp description >

1 0

Re: d3dx8: [patch 2/2] Implement D3DXBoxBoundProbe
by H. Verbeet 28 Jul '08

28 Jul '08

2008/7/28 David Adam <david.adam.cnrs(a)gmail.com>: > + ortho = D3DXVec3Dot(praydirection, &normal[i]); > + if ( ortho && D3DXVec3Subtract(&difference, &point, prayposition) ) > + { > + t = D3DXVec3Dot(&difference, &normal[i]) / ortho; While correct, due to the fact that the box is axis-aligned, this just turns into an expensive way to calculate t = (point->x - prayposition->x) / praydirection->x t = (point->y - prayposition->y) / praydirection->y t = (point->z - prayposition->x) / praydirection->z depending on the face you're testing against. I think performance wise it makes more sense to just write it out for each face, and get rid of the for-loop and normal. > + if ( number_intersection == 2 ) return TRUE; This implies that eg. a ray that starts inside the box doesn't intersect it. Is that intentional? Otherwise you could return early as soon as you find an intersection, and skip testing the other faces. Also note that at least in theory the ray can intersect all six faces of the box if it goes through two opposing corners.

1 0

Re: wined3d: in surface Blt when source and destination are not the same only lock the part of the destination surface that is requested to copy to.
by H. Verbeet 28 Jul '08

28 Jul '08

2008/7/28 Aric Stewart <aric(a)codeweavers.com>: > + if (Src != This) > + { > + xdst.top = 0; > + xdst.bottom = DestRect->bottom - DestRect->top; > + xdst.left = 0; > + xdst.right = DestRect->right - DestRect->left; > + } This will still break the rectangle bounds check further down (around line 940), and anything else that depends on the position of the rectangle within the surface. Come to think of it, the rectangle bounds check should probably be done before trying to lock the surface. Something else I just thought of is that LockRect() probably won't handle mirrored or flipped destination rectangles very well.

2 2

Re: ole32: fix offsets managment
by f.dorin＠free.fr 28 Jul '08

28 Jul '08

>Thank you for your first contribution, but first of all the subject >isn't correct as the patch is to rpcrt4 instead of ole32. Oups, sorry. My apologies for this mistake. But I'm currently working on ole32 and I forgot this file belongs to rpcrt4. I will pay attention next time. >Second of >all, the patch is not correct as it is widl that is generating the >wrong format string here: > >http://www.winehq.org/pipermail/wine-patches/2008-June/056332.html >http://www.winehq.org/pipermail/wine-devel/2008-June/066587.html Thanks for the links. I didn't think one moment it can be a widl bug. I believed it was a rpcrt4 one. François DORIN

1 0

Re: [PATCH] ntdll: use symbols, add documentation for i386 page faulterror code
by Dmitry Timoshkov 28 Jul '08

28 Jul '08

"John Reiser" <jreiser(a)BitWagon.com> wrote: > diff --git a/include/winnt.h b/include/winnt.h > index e8a37f5..ad2f674 100644 > --- a/include/winnt.h > +++ b/include/winnt.h > @@ -812,9 +812,24 @@ typedef struct _CONTEXT86 > > typedef CONTEXT86 CONTEXT; > > -#define EXCEPTION_READ_FAULT 0 > -#define EXCEPTION_WRITE_FAULT 1 > -#define EXCEPTION_EXECUTE_FAULT 8 > +/* Page Fault Error Code. > + * Intel 64 and IA-32 Architectures Software Developer's Manual, Volume 3A: > + * System Programming Guide, Part 1; Figure 5-9, Page-Fault Error Code, p.5-55. > + * http://www.intel.com/design/processor/manuals/253668.pdf > + * linux/arch/x86/mm/fault.c do_page_fault() > + */ > +/* This hardware bit is ignored by shifting it off the bottom. > + *#define EXCEPTION_PAGE_NOT_P (0<<0) > + *#define EXCEPTION_PROT_VIOL (1<<0) > + * > + * Hardware delivers these bits [below] one position to the left. > + */ > +#define EXCEPTION_READ_FAULT (0<<0) > +#define EXCEPTION_WRITE_FAULT (1<<0) /* 1 */ > +#define EXCEPTION_KERNEL_MODE (0<<1) > +#define EXCEPTION_USER_MODE (1<<1) /* 2 */ > +#define EXCEPTION_RSV_PAGETAB (1<<2) /* 4 */ > +#define EXCEPTION_EXECUTE_FAULT (1<<3) /* 8 */ These changes are not compatible with PSDK. -- Dmitry.

1 0

Re: wined3d: universal surface convertor function for unsigned integer color formats(5th attempt)
by Stefan Dösinger 28 Jul '08

28 Jul '08

> Well, the last attempt (with added big-endian support) was submitted several > days ago, and again - no feedback, and patch still isn't accepted. > What's wrong with patch now? Sorry, I must have missed this on Wine-patches again :-( It look ok to me. The endianess #ifdefs look strange, but I don't know how that's supposed to be handled. PS: Sorry, I lost the original mail. I don't know how to supply a reference ID to outlook, so I broke the thread appart

1 0

Re: [WideChar conversion improvements - 5/5] Add a lot of WideCharToMultiByte tests
by Vitaliy Margolen 28 Jul '08

28 Jul '08

Colin Finck wrote: > Remove todo_wine from two tests, which now pass under Wine after the > changes in my previous patches. You have to do that in the patch that fixes the test. Each patch have to be autonomous and have all tests pass before and after it. Vitaliy.

2 2

Re: [3/5] WineD3D: Optimize the fragment processing description
by H. Verbeet 28 Jul '08

28 Jul '08

Is there any particular reason you're not simply using the compiler's support for bit-fields?

3 4

Re: [10/10] [try 5] appwiz.cpl: Gather extra information for SupportInfo dialog
by Owen Rudge 28 Jul '08

28 Jul '08

> 3 files changed, 86 insertions(+), 0 deletions(-) I'm just wondering if there's a reason this patch wasn't committed with the other appwiz patches? The patch applies cleanly to the current git master. If there's anything obviously wrong with it that I've not spotted, please do let me know so I can fix it. Cheers, -- Owen Rudge http://www.owenrudge.net/

2 1

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

← Newer
1
...
4
5
6
7
8
9
10
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2008