February 2007 - Wine-devel - list.winehq.org

Re: [PATCH 2/3] server: Fix get_handle for global handles. It doesn't need process for them.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Vitaliy Margolen <wine-patches(a)kievinfo.com> writes: > Resend as-is. I need this function to work on global handles when > process is NULL. If you need this you are doing something wrong. Callers are not supposed to know that a handle is global. -- Alexandre Julliard julliard(a)winehq.org

2 6

Re: resend : gdi32:WidenPath partial implementation
by Alexandre Julliard 21 Feb '07

21 Feb '07

Laurent Vromman <laurent(a)vromman.org> writes: > + > + dc = DC_GetDCPtr( hdc ); You shouldn't need that, the caller has done it already. Simply pass a DC* to this function. > + if(pPath->state != PATH_Closed) { > + ERR("Path Closed\n"); > + return FALSE; > + } > + > + hPen = SelectObject(hdc, GetStockObject(DC_PEN)); You shouldn't select a new pen into the DC, just use the current one. > + case PT_BEZIERTO: > + // should never happen because of the FlattenPath call Please avoid C++ comments. > + default: > + ERR("Got path flag %d\n", (INT)pPath->pFlags[i]); Please avoid casts like this, use the correct printf format instead. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [10/13] D3D9: Fix the circular converted vertex declaration reference
by H. Verbeet 21 Feb '07

21 Feb '07

On 20/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: > If anyone knows a nicer way to release the converted declaration from > SetVertexDeclaration feel free to comment. > > Not applying this patch won't affect patches 11-13 > Wouldn't it be better to directly compare This against convertedDecl from the device in IDirect3DVertexDeclaration9Impl_Release, rather than adding a convertedDecl flag to IDirect3DVertexDeclaration9Impl and setting / unsetting it? I think it makes things harder than it has to be. Also, afaik Ivan has some tests for the exact behaviour.

2 1

Working on JScript/VBScript support for MSI
by Misha Koshelev 20 Feb '07

20 Feb '07

Hi, since MSDN states that any installer that requires JScript/VBScript must make sure to install it, and since some applications require these for install (bug #7353 and another one is there for VBScript for a different installer), I figure there is no reason why builtin MSI cannot use Microsoft Script if it is there (and plus when we have our own JScript/VBScript we will be able to use it off the bat with MSI). I have posted my initial work on this on the bugzilla for bug #7353. The first file (a patch, will attach also) is my patch which updates custom.c to have the appropriate handlers for the custom action types, extracts the script from the appropriate place, writes it to a file, and uses a framework very similar to the current thread framework for DLLs to call my helper call_script function. This first patch, in theory, should not have to change much (if at all), although I have not thoroughly tested it yet so it probably will. The second file (and attached here too) is dlls/msi/script.c, which is where the meat and potatoes of the actual call_script function is/will be. Right now it is pretty barebones, but it does load the script from the file and calls it appropriately. Now I am working on implementing the Session object, although it looks like a wrapper around MSI functions we already have so I think it should be doable. Anyways, any comments on my work so far will be appreciated. Misha

2 3

Re: [9/10] WineD3D: Use VBOs for index buffers
by Mirek 20 Feb '07

20 Feb '07

Hi, this patch caused regression in many Direct3D games. TES IV: Oblivion can't start game (menu works), Flatout II is completly broken, Alpine Sky Racing 2007 can't run, HalfLife 2 EO can't run. I tried rewrite GLint vbo; to GLuint vbo; but it doesn't help. Mirek Stefan Dösinger napsal(a): > > ------------------------------------------------------------------------ > > From 4d52be700666b6b1e853bad296c502b5b0d76189 Mon Sep 17 00:00:00 2001 > From: Stefan Doesinger <stefan(a)codeweavers.com> > Date: Mon, 19 Feb 2007 15:12:39 +0100 > Subject: [PATCH] WineD3D: Use VBOs for index buffers > > This patch uses (if available) gl vertex buffer objects for static d3d index buffers > to store indices in video memory. Therefore a new index buffer state is added which > binds the vbo to GL_ELEMENT_ARRAY_BUFFER. DrawStrided* use the index buffer stride to > tell if indices are used for drawing because a NULL index data pointer is valid now. > DrawStridedSlow has to read the indices from the index buffer if it is used, because > it can't use the data from the vbo(or only very inefficiently). > --- > dlls/wined3d/device.c | 68 ++++++++++++++++++++++++++++++++++++--- > dlls/wined3d/drawprim.c | 14 ++++++-- > dlls/wined3d/indexbuffer.c | 49 +++++++++++++++++++++++++++- > dlls/wined3d/state.c | 12 +++++++ > dlls/wined3d/wined3d_private.h | 8 ++++- > 5 files changed, 139 insertions(+), 12 deletions(-) > > diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c > index 18f3e75..af0e96a 100644 > --- a/dlls/wined3d/device.c > +++ b/dlls/wined3d/device.c > @@ -443,21 +443,67 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac > return WINED3D_OK; > } > > +static void CreateIndexBufferVBO(IWineD3DDeviceImpl *This, IWineD3DIndexBufferImpl *object) { > + GLenum error, glUsage; > + TRACE("Creating VBO for Index Buffer %p\n", object); > + > + ENTER_GL(); > + while(glGetError()); > + > + GL_EXTCALL(glGenBuffersARB(1, &object->vbo)); > + error = glGetError(); > + if(error != GL_NO_ERROR || object->vbo == 0) { > + ERR("Creating a vbo failed, continueing without vbo for this buffer\n"); > + object->vbo = 0; > + return; > + } > + > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->vbo)); > + error = glGetError(); > + if(error != GL_NO_ERROR) { > + ERR("Failed to bind index buffer, continueing without vbo for this buffer\n"); > + goto out; > + } > + > + /* Use static write only usage for now. Dynamic index buffers stay in sysmem, and due to the sysmem > + * copy no readback will be needed > + */ > + glUsage = GL_STATIC_DRAW; > + GL_EXTCALL(glBufferDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, object->resource.size, NULL, glUsage)); > + error = glGetError(); > + if(error != GL_NO_ERROR) { > + ERR("Failed to initialize the index buffer\n"); > + goto out; > + } > + LEAVE_GL(); > + TRACE("Successfully created vbo %d for index buffer %p\n", object->vbo, object); > + return; > + > +out: > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + GL_EXTCALL(glDeleteBuffersARB(1, &object->vbo)); > + LEAVE_GL(); > + object->vbo = 0; > +} > + > static HRESULT WINAPI IWineD3DDeviceImpl_CreateIndexBuffer(IWineD3DDevice *iface, UINT Length, DWORD Usage, > WINED3DFORMAT Format, WINED3DPOOL Pool, IWineD3DIndexBuffer** ppIndexBuffer, > HANDLE *sharedHandle, IUnknown *parent) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > IWineD3DIndexBufferImpl *object; > TRACE("(%p) Creating index buffer\n", This); > - > + > /* Allocate the storage for the device */ > D3DCREATERESOURCEOBJECTINSTANCE(object,IndexBuffer,WINED3DRTYPE_INDEXBUFFER, Length) > - > - /*TODO: use VBO's */ > - if (Pool == WINED3DPOOL_DEFAULT ) { /* Allocate some system memory for now */ > + > + if (Pool == WINED3DPOOL_DEFAULT ) { /* We need a local copy for drawStridedSlow */ > object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,object->resource.size); > } > > + if(Pool != WINED3DPOOL_SYSTEMMEM && !(Usage & WINED3DUSAGE_DYNAMIC) && GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { > + CreateIndexBufferVBO(This, object); > + } > + > TRACE("(%p) : Len=%d, Use=%x, Format=(%u,%s), Pool=%d - Memory@%p, Iface@%p\n", This, Length, Usage, Format, > debug_d3dformat(Format), Pool, object, object->resource.allocatedMemory); > *ppIndexBuffer = (IWineD3DIndexBuffer *) object; > @@ -2557,10 +2603,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetIndices(IWineD3DDevice *iface, IWine > return WINED3D_OK; > } > > - /* So far only the base vertex index is tracked */ > + /* The base vertex index affects the stream sources, while > + * The index buffer is a seperate index buffer state > + */ > if(BaseVertexIndex != oldBaseIndex) { > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_STREAMSRC); > } > + if(oldIdxs != pIndexData) { > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > + } > return WINED3D_OK; > } > > @@ -4224,9 +4275,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > UINT idxStride = 2; > IWineD3DIndexBuffer *pIB; > WINED3DINDEXBUFFER_DESC IdxBufDsc; > + GLint vbo; > > pIB = This->stateBlock->pIndexData; > This->stateBlock->streamIsUP = FALSE; > + vbo = ((IWineD3DIndexBufferImpl *) pIB)->vbo; > > TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This, > PrimitiveType, debug_d3dprimitivetype(PrimitiveType), > @@ -4245,7 +4298,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice * > } > > drawPrimitive(iface, PrimitiveType, primCount, 0, NumVertices, startIndex, > - idxStride, ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex); > + idxStride, vbo ? NULL : ((IWineD3DIndexBufferImpl *) pIB)->resource.allocatedMemory, minIndex); > > return WINED3D_OK; > } > @@ -4310,6 +4363,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveUP(IWineD3DDevice * > This->stateBlock->loadBaseVertexIndex = 0; > /* Mark the state dirty until we have nicer tracking of the stream source pointers */ > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > > drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* vertexStart */, NumVertices, 0 /* indxStart */, idxStride, pIndexData, MinVertexIndex); > > @@ -4332,8 +4386,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *i > * that value. > */ > IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); > + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); > This->stateBlock->baseVertexIndex = 0; > This->up_strided = DrawPrimStrideData; > + This->stateBlock->streamIsUP = TRUE; > drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0, 0, 0, 0, NULL, 0); > This->up_strided = NULL; > return WINED3D_OK; > diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c > index 2cc3a15..7cf6877 100644 > --- a/dlls/wined3d/drawprim.c > +++ b/dlls/wined3d/drawprim.c > @@ -571,7 +571,7 @@ static void drawStridedFast(IWineD3DDevice *iface,UINT numberOfVertices, GLenum > const void *idxData, short idxSize, ULONG minIndex, ULONG startIdx, ULONG startVertex) { > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; > > - if (idxData != NULL /* This crashes sometimes!*/) { > + if (idxSize != 0 /* This crashes sometimes!*/) { > TRACE("(%p) : glElements(%x, %d, %d, ...)\n", This, glPrimitiveType, numberOfVertices, minIndex); > idxData = idxData == (void *)-1 ? NULL : idxData; > #if 1 > @@ -629,7 +629,15 @@ static void drawStridedSlow(IWineD3DDevice *iface, WineDirect3DVertexStridedData > TRACE("Using slow vertex array code\n"); > > /* Variable Initialization */ > - if (idxData != NULL) { > + if (idxSize != 0) { > + /* Immediate mode drawing can't make use of indices in a vbo - get the data from the index buffer. > + * If the index buffer has no vbo(not supported or other reason), or with user pointer drawing > + * idxData will be != NULL > + */ > + if(idxData == NULL) { > + idxData = ((IWineD3DIndexBufferImpl *) This->stateBlock->pIndexData)->resource.allocatedMemory; > + } > + > if (idxSize == 2) pIdxBufS = (const short *) idxData; > else pIdxBufL = (const long *) idxData; > } > @@ -1165,7 +1173,7 @@ inline void drawStridedInstanced(IWineD3DDevice *iface, WineDirect3DVertexStride > IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; > IWineD3DStateBlockImpl *stateblock = This->stateBlock; > > - if (idxData == NULL) { > + if (idxSize == 0) { > /* This is a nasty thing. MSDN says no hardware supports that and apps have to use software vertex processing. > * We don't support this for now > * > diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c > index 39a270d..0f768ac 100644 > --- a/dlls/wined3d/indexbuffer.c > +++ b/dlls/wined3d/indexbuffer.c > @@ -58,6 +58,15 @@ static ULONG WINAPI IWineD3DIndexBufferImpl_Release(IWineD3DIndexBuffer *iface) > ULONG ref = InterlockedDecrement(&This->resource.ref); > TRACE("(%p) : Releasing from %d\n", This, ref + 1); > if (ref == 0) { > + if(This->vbo) { > + ENTER_GL(); > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glDeleteBuffersARB(1, &This->vbo)); > + checkGLcall("glDeleteBuffersARB"); > + LEAVE_GL(); > + } > + > IWineD3DResourceImpl_CleanUp((IWineD3DResource *)iface); > HeapFree(GetProcessHeap(), 0, This); > } > @@ -108,13 +117,49 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_GetParent(IWineD3DIndexBuffer *ifa > ****************************************************** */ > static HRESULT WINAPI IWineD3DIndexBufferImpl_Lock(IWineD3DIndexBuffer *iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { > IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; > - TRACE("(%p) : no real locking yet, offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags); > + TRACE("(%p) : offset %d, size %d, Flags=%x\n", This, OffsetToLock, SizeToLock, Flags); > + > + InterlockedIncrement(&This->lockcount); > *ppbData = (BYTE *)This->resource.allocatedMemory + OffsetToLock; > + > + if(Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) || This->vbo == 0) { > + return WINED3D_OK; > + } > + > + if(This->dirtystart != This->dirtyend) { > + if(This->dirtystart > OffsetToLock) This->dirtystart = OffsetToLock; > + if(SizeToLock) { > + if(This->dirtyend < OffsetToLock + SizeToLock) This->dirtyend = OffsetToLock + SizeToLock; > + } else { > + This->dirtyend = This->resource.size; > + } > + } else { > + This->dirtystart = OffsetToLock; > + if(SizeToLock) > + This->dirtyend = OffsetToLock + SizeToLock; > + else > + This->dirtyend = This->resource.size; > + } > + > return WINED3D_OK; > } > static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) { > IWineD3DIndexBufferImpl *This = (IWineD3DIndexBufferImpl *)iface; > - TRACE("(%p) : stub\n", This); > + unsigned long locks = InterlockedDecrement(&This->lockcount);; > + TRACE("(%p)\n", This); > + > + /* For now load in unlock */ > + if(locks == 0 && This->vbo) { > + ENTER_GL(); > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, This->vbo)); > + checkGLcall("glBindBufferARB"); > + GL_EXTCALL(glBufferSubDataARB(GL_ELEMENT_ARRAY_BUFFER_ARB, > + This->dirtystart, This->dirtyend - This->dirtystart, This->resource.allocatedMemory + This->dirtystart)); > + checkGLcall("glBufferSubDataARB"); > + LEAVE_GL(); > + This->dirtystart = 0; > + This->dirtyend = 0; > + } > return WINED3D_OK; > } > static HRESULT WINAPI IWineD3DIndexBufferImpl_GetDesc(IWineD3DIndexBuffer *iface, WINED3DINDEXBUFFER_DESC *pDesc) { > diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c > index 0b96e54..f78720a 100644 > --- a/dlls/wined3d/state.c > +++ b/dlls/wined3d/state.c > @@ -3062,6 +3062,17 @@ static void scissorrect(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D > checkGLcall("glScissor"); > } > > +static void indexbuffer(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { > + if(GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT)) { > + if(stateblock->streamIsUP || stateblock->pIndexData == NULL ) { > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, 0)); > + } else { > + IWineD3DIndexBufferImpl *ib = (IWineD3DIndexBufferImpl *) stateblock->pIndexData; > + GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, ib->vbo)); > + } > + } > +} > + > const struct StateEntry StateTable[] = > { > /* State name representative, apply function */ > @@ -4077,6 +4088,7 @@ const struct StateEntry StateTable[] = > { /*511, WINED3DTS_WORLDMATRIX(255) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_worldex }, > /* Various Vertex states follow */ > { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, > + { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, indexbuffer }, > { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, > { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, > { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, > diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h > index 3bf0c8e..be8cd6e 100644 > --- a/dlls/wined3d/wined3d_private.h > +++ b/dlls/wined3d/wined3d_private.h > @@ -426,8 +426,10 @@ typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, > > #define STATE_STREAMSRC (STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)) + 1) > #define STATE_IS_STREAMSRC(a) ((a) == STATE_STREAMSRC) > +#define STATE_INDEXBUFFER (STATE_STREAMSRC + 1) > +#define STATE_IS_INDEXBUFFER(a) ((a) == STATE_INDEXBUFFER) > > -#define STATE_VDECL (STATE_STREAMSRC + 1) > +#define STATE_VDECL (STATE_INDEXBUFFER + 1) > #define STATE_IS_VDECL(a) ((a) == STATE_VDECL) > > #define STATE_VSHADER (STATE_VDECL + 1) > @@ -793,6 +795,10 @@ typedef struct IWineD3DIndexBufferImpl > const IWineD3DIndexBufferVtbl *lpVtbl; > IWineD3DResourceClass resource; > > + GLuint vbo; > + UINT dirtystart, dirtyend; > + LONG lockcount; > + > /* WineD3DVertexBuffer specifics */ > } IWineD3DIndexBufferImpl; > > > > ------------------------------------------------------------------------ > >

2 3

Re: Rediffed patch from Rein Klazes:winex11.drv:Add pointer check in X11DRV_SetDIBits
by Felix Nawothnig 20 Feb '07

20 Feb '07

Louis. Lenders wrote: > + if( IsBadReadPtr( bits, nrsrcbytes)) return 0; AFAIK you should never use that function since it introduces a race con. Try using an exception handler around the memory access itself. Felix

1 0

wine-0.9.31 version is absent from bugzilla
by Vitaliy Margolen 20 Feb '07

20 Feb '07

Please whoever has powers to add new versions to bugzilla, can they please do that? Thanks. Vitaliy.

3 2

a big fan of your work
by Jeffrey Sabarese 20 Feb '07

20 Feb '07

hi there! I have to wonder if i don't use WinE more than the "average" Fedora Core 5 user. I am forever trying to figure out how to run my old Windows apps here in the linux environment, using your incredible software. If ever you seek a "test subject", or feedback of any kind, please don't hesitate to include me as a candidate for some "volunteer work". If i may be so bold, i wish to address an issue related to WinE and some Web Development software: I have been able to successfully install, and use the Web Dev IDE, HomeSite+ (as in "the homesite which comes w/ dreamweaver nowadays"). previous to this, i was unable to get Bradbury's TopStyle Lite to operate under WinE due to the inability to "find Internet Exlorer", yet it seems as though HomeSite opens TopStyle w/out it's dependecy on IE keeping it from opening (bypassing the "warning" you might say). [can i just say it's sooo cool to finally have TopStyle here in Linux!!! thank you!). I guess you could say then that my question for you is: "How might i go about trying to get IE6 to be "recognized" by such WinE-apps as TopStyle?" I have installed, and use the "ies4linux" ( here for more info if you're unfamiliar with it: http://novicenotes.com/install-internet-explorer-on-linux-under-wine-run-ie… ), but though it works VERY well launching from the Fedora Terminal, i can't seem to get it to be recognized by "Windows" (WinE) as an available Browser. The apps i've tried which seem unable to integrate it are i. EditPlus 2.x (current) ii. TSW WebCoder 5 (as TSW Webcoder 2005 ( Delphi ) will NOT run on WinE, though i wish i did as i have a purchased licence) iii. TopStyle Lite iv. HomeSite Dreamweaver 8 will both run on WinE, and execute "normally", the ies4linux IE6-- yet, obviously there is a primary difference in that IE is NOT integrated into DreamWeaver as "part of the app", as it is in WebCoder and TopStyle. My best guess is that those apps have some security measure preventing a "non-standard" IE to become part of its processes. who knows. anyway-- i thought there was something else, but i suppose that's more than enough b.s. from me from one sitting. good luck in your work! if you have any ideas for my situation, i'd appriciate your input. again, please don't hesitate to inquire if you'd like for me to "test" anything for you and report my findings. i realize you probably have a whole lot of people already out there, but feel free to add me to the list. thanks, --Jeff Sabarese

3 2

Re: [7/10] WineD3D: No bounds checking is done on sampler / texture numbers
by H. Verbeet 20 Feb '07

20 Feb '07

On 19/02/07, Stefan Dösinger <stefan(a)codeweavers.com> wrote: >- if(Sampler > GL_LIMITS(sampler_stages) || Sampler < 0 || Type > WINED3D_HIGHEST_SAMPLER_STATE || Type < 0) { This also checked the sampler state, not just the sampler.

4 5

Re: [PATCH 3/3] server: Check object's security when creating handles.
by Robert Shearman 20 Feb '07

20 Feb '07

Vitaliy Margolen wrote: > After > checking object's SD against token we fail some tests. > What it seems to me is that some one tried to "optimize" this part in > windows and instead created a security problem. If you already have a valid handle to the object, then it isn't really a security problem to have another one with the same access rights. > @@ -450,25 +453,34 @@ obj_handle_t duplicate_handle( struct pr > unsigned int access, unsigned int attr, unsigned int options ) > { > obj_handle_t res; > + struct handle_entry *entry; > + unsigned int src_access, dst_access; > struct object *obj = get_handle_obj( src, src_handle, 0, NULL ); > > if (!obj) return 0; > - if (options & DUP_HANDLE_SAME_ACCESS) > + if ((entry = get_handle( src, src_handle ))) > + src_access = entry->access; > + else /* pseudo-handle, give it full access */ > { > - struct handle_entry *entry = get_handle( src, src_handle ); > - if (entry) > - access = entry->access; > - else /* pseudo-handle, give it full access */ > - { > - access = obj->ops->map_access( obj, GENERIC_ALL ); > - clear_error(); > - } > + src_access = obj->ops->map_access( obj, GENERIC_ALL ); > + clear_error(); > } > - access &= ~RESERVED_ALL; > + src_access &= ~RESERVED_ALL; > + > + if (options & DUP_HANDLE_SAME_ACCESS) > + dst_access = src_access; > + else > + dst_access = obj->ops->map_access( obj, access ) & ~RESERVED_ALL; > + > + /* asking for more or the same/less access rights */ > + access = ~src_access & dst_access ? dst_access : 0; > + > if (options & DUP_HANDLE_MAKE_GLOBAL) > res = alloc_global_handle( obj, access ); > else > res = alloc_handle( dst, obj, access, attr ); > + if (res) get_handle( dst, res )->access = dst_access; > + > It would seem better to add an extra parameter to alloc_handle and alloc_global_handle to tell them to not check access rather than adding this hack. It should use less processor time and it should make patch 2 not necessary. -- Rob Shearman

2 1