August 2007 - Wine-Commits - list.winehq.org

Rob Shearman : secur32: Split the NTLM credential and context handles into separate objects.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 888a8e27b8d00c23c298533e252c93381c455ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=888a8e27b8d00c23c298533e2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Aug 7 17:12:32 2007 +0100 secur32: Split the NTLM credential and context handles into separate objects. This prevents races with two threads using the helper object at the same time on two different context handles, eliminates the need to free the credential handle after freeing the context handles and also prevents a crash caused by not clearing session_key in DeleteSecurityContext. --- dlls/secur32/dispatcher.c | 1 - dlls/secur32/ntlm.c | 327 +++++++++++++++++++++++++++---------------- dlls/secur32/secur32_priv.h | 2 - 3 files changed, 209 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=888a8e27b8d00c23c2985…

1 0

Stefan Dösinger : wined3d: Store the position_transformed flag in the vdecl.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: b8dd5839efe0d40d1e85a826f127f5034b800135 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8dd5839efe0d40d1e85a826f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 12:35:33 2007 +0200 wined3d: Store the position_transformed flag in the vdecl. --- dlls/wined3d/drawprim.c | 11 +++-------- dlls/wined3d/vertexdeclaration.c | 12 ++++++++---- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 98cc4ec..c35ce69 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -160,14 +160,9 @@ void primitiveDeclarationConvertToStridedData( DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ - strided->u.s.position_transformed = FALSE; - for (i = 0; i < vertexDeclaration->declarationWNumElements - 1; ++i) { - element = vertexDeclaration->pDeclarationWine + i; - - if (element->Usage == WINED3DDECLUSAGE_POSITIONT) { - strided->u.s.position_transformed = TRUE; - useVertexShaderFunction = FALSE; - } + strided->u.s.position_transformed = vertexDeclaration->position_transformed; + if(vertexDeclaration->position_transformed) { + useVertexShaderFunction = FALSE; } /* Translate the declaration into strided data */ diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 2bbca7d..292f1f0 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -143,14 +143,18 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte /* Do some static analysis on the elements to make reading the declaration more comfortable * for the drawing code - * - * First, find the Streams used in the declaration. The vertex buffers have to be loaded - * when drawing. */ This->num_streams = 0; + This->position_transformed = FALSE; for (i = 0; i < element_count; ++i) { - /* Filter tesselation pseudo streams*/ + if(This->pDeclarationWine[i].Usage == WINED3DDECLUSAGE_POSITIONT) { + This->position_transformed = TRUE; + } + + /* Find the Streams used in the declaration. The vertex buffers have to be loaded + * when drawing, but filter tesselation pseudo streams + */ if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; if(!isPreLoaded[This->pDeclarationWine[i].Stream]) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 240dca5..83915ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1228,6 +1228,7 @@ typedef struct IWineD3DVertexDeclarationImpl { DWORD streams[MAX_STREAMS]; UINT num_streams; + BOOL position_transformed; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

1 0

Stefan Dösinger : wined3d: Determine used streams at vdecl creation.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 06e51c21e1fce91079a7d6bd3e2621d687522ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e51c21e1fce91079a7d6bd3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 3 19:53:25 2007 +0200 wined3d: Determine used streams at vdecl creation. --- dlls/wined3d/drawprim.c | 13 +++---------- dlls/wined3d/vertexdeclaration.c | 23 ++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 3 +++ 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dc9e761..98cc4ec 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -156,10 +156,8 @@ void primitiveDeclarationConvertToStridedData( WINED3DVERTEXELEMENT *element; DWORD stride; int reg; - char isPreLoaded[MAX_STREAMS]; - DWORD preLoadStreams[MAX_STREAMS], numPreloadStreams = 0; - - memset(isPreLoaded, 0, sizeof(isPreLoaded)); + DWORD numPreloadStreams = This->stateBlock->streamIsUP ? 0 : vertexDeclaration->num_streams; + DWORD *streams = vertexDeclaration->streams; /* Check for transformed vertices, disable vertex shader if present */ strided->u.s.position_transformed = FALSE; @@ -191,11 +189,6 @@ void primitiveDeclarationConvertToStridedData( data = (BYTE *)This->stateBlock->streamSource[element->Stream]; } else { TRACE("Stream isn't up %d, %p\n", element->Stream, This->stateBlock->streamSource[element->Stream]); - if(!isPreLoaded[element->Stream]) { - preLoadStreams[numPreloadStreams] = element->Stream; - numPreloadStreams++; - isPreLoaded[element->Stream] = 1; - } data = IWineD3DVertexBufferImpl_GetMemory(This->stateBlock->streamSource[element->Stream], 0, &streamVBO); if(fixup) { if( streamVBO != 0) *fixup = TRUE; @@ -242,7 +235,7 @@ void primitiveDeclarationConvertToStridedData( * once in there. */ for(i=0; i < numPreloadStreams; i++) { - IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[preLoadStreams[i]]); + IWineD3DVertexBuffer_PreLoad(This->stateBlock->streamSource[streams[i]]); } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index be5d542..2bbca7d 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -120,11 +120,13 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte const WINED3DVERTEXELEMENT *elements, size_t element_count) { IWineD3DVertexDeclarationImpl *This = (IWineD3DVertexDeclarationImpl *)iface; HRESULT hr = WINED3D_OK; + int i; + char isPreLoaded[MAX_STREAMS]; TRACE("(%p) : d3d version %d\n", This, ((IWineD3DImpl *)This->wineD3DDevice->wineD3D)->dxVersion); + memset(isPreLoaded, 0, sizeof(isPreLoaded)); if (TRACE_ON(d3d_decl)) { - int i; for (i = 0; i < element_count; ++i) { dump_wined3dvertexelement(elements+i); } @@ -139,6 +141,25 @@ static HRESULT WINAPI IWineD3DVertexDeclarationImpl_SetDeclaration(IWineD3DVerte CopyMemory(This->pDeclarationWine, elements, sizeof(WINED3DVERTEXELEMENT) * element_count); } + /* Do some static analysis on the elements to make reading the declaration more comfortable + * for the drawing code + * + * First, find the Streams used in the declaration. The vertex buffers have to be loaded + * when drawing. + */ + This->num_streams = 0; + for (i = 0; i < element_count; ++i) { + + /* Filter tesselation pseudo streams*/ + if(This->pDeclarationWine[i].Stream >= MAX_STREAMS) continue; + + if(!isPreLoaded[This->pDeclarationWine[i].Stream]) { + This->streams[This->num_streams] = This->pDeclarationWine[i].Stream; + This->num_streams++; + isPreLoaded[This->pDeclarationWine[i].Stream] = 1; + } + } + TRACE("Returning\n"); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 548c337..240dca5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1225,6 +1225,9 @@ typedef struct IWineD3DVertexDeclarationImpl { WINED3DVERTEXELEMENT *pDeclarationWine; UINT declarationWNumElements; + + DWORD streams[MAX_STREAMS]; + UINT num_streams; } IWineD3DVertexDeclarationImpl; extern const IWineD3DVertexDeclarationVtbl IWineD3DVertexDeclaration_Vtbl;

1 0

Stefan Dösinger : wined3d: Remove link collection from vertexdeclaration.c.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: ca0d92f3bc1c3d15e566c7e84fbf2dfba1be39f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca0d92f3bc1c3d15e566c7e84… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jul 30 11:45:28 2007 +0200 wined3d: Remove link collection from vertexdeclaration.c. --- dlls/wined3d/vertexdeclaration.c | 32 -------------------------------- 1 files changed, 0 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index bdf07b6..be5d542 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -26,38 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_decl); -/** - * DirectX9 SDK download - * http://msdn.microsoft.com/library/default.asp?url=/downloads/list/directx.a… - * - * Exploring D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Using Vertex Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dndrive/ht… - * - * Dx9 New - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 Shaders - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * Dx9 D3DX - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * FVF - * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c… - * - * NVIDIA: DX8 Vertex Shader to NV Vertex Program - * http://developer.nvidia.com/view.asp?IO=vstovp - * - * NVIDIA: Memory Management with VAR - * http://developer.nvidia.com/view.asp?IO=var_memory_management - */ - static void dump_wined3dvertexelement(const WINED3DVERTEXELEMENT *element) { TRACE(" Stream: %d\n", element->Stream); TRACE(" Offset: %d\n", element->Offset);

1 0

Stefan Dösinger : d3d: Add a simple offscreen rendering test.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 2d15cb8b278afd14f33bc5015806061a8bdec4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d15cb8b278afd14f33bc5015… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 16:47:08 2007 +0200 d3d: Add a simple offscreen rendering test. --- dlls/d3d8/tests/visual.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3d9/tests/visual.c | 114 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/visual.c | 101 +++++++++++++++++++++++++++++++++++++ 3 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2d15cb8b278afd14f33bc…

1 0

Stefan Dösinger : ddraw: Implement IDirect3DDevice7:: DrawIndexedPrimitiveStrided.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 89dccc7c7c73c8497d6370a16c4a251de797f114 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89dccc7c7c73c8497d6370a16… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 27 14:39:55 2007 +0200 ddraw: Implement IDirect3DDevice7::DrawIndexedPrimitiveStrided. --- dlls/ddraw/device.c | 106 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/device.c | 23 ++++++++- include/wine/wined3d_interface.h | 2 + 3 files changed, 126 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index d0cfcdf..56e5cf3 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3621,12 +3621,110 @@ IDirect3DDeviceImpl_7_DrawIndexedPrimitiveStrided(IDirect3DDevice7 *iface, DWORD Flags) { ICOM_THIS_FROM(IDirect3DDeviceImpl, IDirect3DDevice7, iface); - FIXME("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x): stub!\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); + WineDirect3DVertexStridedData WineD3DStrided; + int i; + UINT PrimitiveCount; + HRESULT hr; + + TRACE("(%p)->(%08x,%08x,%p,%08x,%p,%08x,%08x)\n", This, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Indices, IndexCount, Flags); - /* I'll implement it as soon as I find a app to test it. - * This needs an additional method in IWineD3DDevice. + memset(&WineD3DStrided, 0, sizeof(WineD3DStrided)); + /* Get the strided data right. the wined3d structure is a bit bigger + * Watch out: The contents of the strided data are determined by the fvf, + * not by the members set in D3DDrawPrimStrideData. So it's valid + * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is + * not set in the fvf. */ - return D3D_OK; + if(VertexType & D3DFVF_POSITION_MASK) + { + WineD3DStrided.u.s.position.lpData = D3DDrawPrimStrideData->position.lpvData; + WineD3DStrided.u.s.position.dwStride = D3DDrawPrimStrideData->position.dwStride; + WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT3; + if (VertexType & D3DFVF_XYZRHW) + { + WineD3DStrided.u.s.position.dwType = WINED3DDECLTYPE_FLOAT4; + WineD3DStrided.u.s.position_transformed = TRUE; + } else + WineD3DStrided.u.s.position_transformed = FALSE; + } + + if(VertexType & D3DFVF_NORMAL) + { + WineD3DStrided.u.s.normal.lpData = D3DDrawPrimStrideData->normal.lpvData; + WineD3DStrided.u.s.normal.dwStride = D3DDrawPrimStrideData->normal.dwStride; + WineD3DStrided.u.s.normal.dwType = WINED3DDECLTYPE_FLOAT3; + } + + if(VertexType & D3DFVF_DIFFUSE) + { + WineD3DStrided.u.s.diffuse.lpData = D3DDrawPrimStrideData->diffuse.lpvData; + WineD3DStrided.u.s.diffuse.dwStride = D3DDrawPrimStrideData->diffuse.dwStride; + WineD3DStrided.u.s.diffuse.dwType = WINED3DDECLTYPE_SHORT4; + } + + if(VertexType & D3DFVF_SPECULAR) + { + WineD3DStrided.u.s.specular.lpData = D3DDrawPrimStrideData->specular.lpvData; + WineD3DStrided.u.s.specular.dwStride = D3DDrawPrimStrideData->specular.dwStride; + WineD3DStrided.u.s.specular.dwType = WINED3DDECLTYPE_SHORT4; + } + + for( i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); i++) + { + WineD3DStrided.u.s.texCoords[i].lpData = D3DDrawPrimStrideData->textureCoords[i].lpvData; + WineD3DStrided.u.s.texCoords[i].dwStride = D3DDrawPrimStrideData->textureCoords[i].dwStride; + switch(GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)) + { + case 1: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT1; break; + case 2: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT2; break; + case 3: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT3; break; + case 4: WineD3DStrided.u.s.texCoords[i].dwType = WINED3DDECLTYPE_FLOAT4; break; + default: ERR("Unexpected texture coordinate size %d\n", + GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)); + } + } + + /* Get the primitive count */ + switch(PrimitiveType) + { + case D3DPT_POINTLIST: + PrimitiveCount = IndexCount; + break; + + case D3DPT_LINELIST: + PrimitiveCount = IndexCount / 2; + break; + + case D3DPT_LINESTRIP: + PrimitiveCount = IndexCount - 1; + break; + + case D3DPT_TRIANGLELIST: + PrimitiveCount = IndexCount / 3; + break; + + case D3DPT_TRIANGLESTRIP: + PrimitiveCount = IndexCount - 2; + break; + + case D3DPT_TRIANGLEFAN: + PrimitiveCount = IndexCount - 2; + break; + + default: return DDERR_INVALIDPARAMS; + } + + /* WineD3D doesn't need the FVF here */ + EnterCriticalSection(&ddraw_cs); + hr = IWineD3DDevice_DrawIndexedPrimitiveStrided(This->wineD3DDevice, + PrimitiveType, + PrimitiveCount, + &WineD3DStrided, + VertexCount, + Indices, + WINED3DFMT_INDEX16); + LeaveCriticalSection(&ddraw_cs); + return hr; } static HRESULT WINAPI diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 65c5382..5f894bd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4755,7 +4755,27 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawPrimitiveStrided (IWineD3DDevice *i This->up_strided = NULL; return WINED3D_OK; } - /* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ + +static HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided(IWineD3DDevice *iface, WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData, UINT NumVertices, CONST void *pIndexData, WINED3DFORMAT IndexDataFormat) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + DWORD idxSize = (IndexDataFormat == WINED3DFMT_INDEX32 ? 4 : 2); + + /* Mark the state dirty until we have nicer tracking + * its fine to change baseVertexIndex because that call is only called by ddraw which does not need + * that value. + */ + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_VDECL); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_INDEXBUFFER); + This->stateBlock->streamIsUP = TRUE; + This->stateBlock->baseVertexIndex = 0; + This->up_strided = DrawPrimStrideData; + drawPrimitive(iface, PrimitiveType, PrimitiveCount, 0 /* startvertexidx */, 0 /* numindices */, 0 /* startidx */, idxSize, pIndexData, 0 /* minindex */); + This->up_strided = NULL; + return WINED3D_OK; +} + + +/* Yet another way to update a texture, some apps use this to load default textures instead of using surface/texture lock/unlock */ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, IWineD3DBaseTexture *pSourceTexture, IWineD3DBaseTexture *pDestinationTexture){ IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; HRESULT hr = WINED3D_OK; @@ -6667,6 +6687,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_DrawPrimitiveUP, IWineD3DDeviceImpl_DrawIndexedPrimitiveUP, IWineD3DDeviceImpl_DrawPrimitiveStrided, + IWineD3DDeviceImpl_DrawIndexedPrimitiveStrided, IWineD3DDeviceImpl_DrawRectPatch, IWineD3DDeviceImpl_DrawTriPatch, IWineD3DDeviceImpl_DeletePatch, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 3823515..35430b9 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -472,6 +472,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(DrawPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawIndexedPrimitiveUP)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertexIndices, UINT PrimitiveCount, CONST void * pIndexData, WINED3DFORMAT IndexDataFormat, CONST void * pVertexStreamZeroData, UINT VertexStreamZeroStride) PURE; STDMETHOD(DrawPrimitiveStrided)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData) PURE; + STDMETHOD(DrawIndexedPrimitiveStrided)(THIS_ WINED3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, WineDirect3DVertexStridedData *DrawPrimStrideData, UINT NumVertices, CONST void *pIndexData, WINED3DFORMAT IndexDataFormat) PURE; STDMETHOD(DrawRectPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DRECTPATCH_INFO* pRectPatchInfo) PURE; STDMETHOD(DrawTriPatch)(THIS_ UINT Handle, CONST float* pNumSegs, CONST WINED3DTRIPATCH_INFO* pTriPatchInfo) PURE; STDMETHOD(DeletePatch)(THIS_ UINT Handle) PURE; @@ -611,6 +612,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_DrawPrimitiveUP(p,a,b,c,d) (p)->lpVtbl->DrawPrimitiveUP(p,a,b,c,d) #define IWineD3DDevice_DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->DrawIndexedPrimitiveUP(p,a,b,c,d,e,f,g,h) #define IWineD3DDevice_DrawPrimitiveStrided(p,a,b,c) (p)->lpVtbl->DrawPrimitiveStrided(p,a,b,c) +#define IWineD3DDevice_DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f) (p)->lpVtbl->DrawIndexedPrimitiveStrided(p,a,b,c,d,e,f) #define IWineD3DDevice_DrawRectPatch(p,a,b,c) (p)->lpVtbl->DrawRectPatch(p,a,b,c) #define IWineD3DDevice_DrawTriPatch(p,a,b,c) (p)->lpVtbl->DrawTriPatch(p,a,b,c) #define IWineD3DDevice_DeletePatch(p,a) (p)->lpVtbl->DeletePatch(p,a)

1 0

Paul Vriens : shlwapi/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 3de1c55dc6b8a29a1dc0717c66f940caa1bc93b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de1c55dc6b8a29a1dc0717c6… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 15:16:32 2007 +0200 shlwapi/tests: Use GetModuleHandleA instead of LoadLibraryA. --- dlls/shlwapi/tests/clist.c | 54 ++++++++++++++++++----------------------- dlls/shlwapi/tests/clsid.c | 13 ++------- dlls/shlwapi/tests/ordinal.c | 7 +---- dlls/shlwapi/tests/path.c | 3 +- 4 files changed, 29 insertions(+), 48 deletions(-) diff --git a/dlls/shlwapi/tests/clist.c b/dlls/shlwapi/tests/clist.c index e6e4b05..5f94b4f 100644 --- a/dlls/shlwapi/tests/clist.c +++ b/dlls/shlwapi/tests/clist.c @@ -214,33 +214,30 @@ static HRESULT (WINAPI *pSHLWAPI_214)(_IDummyStream*,ULARGE_INTEGER*); static void InitFunctionPtrs(void) { - SHLWAPI_hshlwapi = LoadLibraryA("shlwapi.dll"); - ok(SHLWAPI_hshlwapi != 0, "LoadLibrary failed\n"); - if (SHLWAPI_hshlwapi) - { - pSHLWAPI_17 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)17); - ok(pSHLWAPI_17 != 0, "No Ordinal 17\n"); - pSHLWAPI_18 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)18); - ok(pSHLWAPI_18 != 0, "No Ordinal 18\n"); - pSHLWAPI_19 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)19); - ok(pSHLWAPI_19 != 0, "No Ordinal 19\n"); - pSHLWAPI_20 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)20); - ok(pSHLWAPI_20 != 0, "No Ordinal 20\n"); - pSHLWAPI_21 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)21); - ok(pSHLWAPI_21 != 0, "No Ordinal 21\n"); - pSHLWAPI_22 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)22); - ok(pSHLWAPI_22 != 0, "No Ordinal 22\n"); - pSHLWAPI_166 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)166); - ok(pSHLWAPI_166 != 0, "No Ordinal 166\n"); - pSHLWAPI_184 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)184); - ok(pSHLWAPI_184 != 0, "No Ordinal 184\n"); - pSHLWAPI_212 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)212); - ok(pSHLWAPI_212 != 0, "No Ordinal 212\n"); - pSHLWAPI_213 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)213); - ok(pSHLWAPI_213 != 0, "No Ordinal 213\n"); - pSHLWAPI_214 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)214); - ok(pSHLWAPI_214 != 0, "No Ordinal 214\n"); - } + SHLWAPI_hshlwapi = GetModuleHandleA("shlwapi.dll"); + + pSHLWAPI_17 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)17); + ok(pSHLWAPI_17 != 0, "No Ordinal 17\n"); + pSHLWAPI_18 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)18); + ok(pSHLWAPI_18 != 0, "No Ordinal 18\n"); + pSHLWAPI_19 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)19); + ok(pSHLWAPI_19 != 0, "No Ordinal 19\n"); + pSHLWAPI_20 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)20); + ok(pSHLWAPI_20 != 0, "No Ordinal 20\n"); + pSHLWAPI_21 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)21); + ok(pSHLWAPI_21 != 0, "No Ordinal 21\n"); + pSHLWAPI_22 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)22); + ok(pSHLWAPI_22 != 0, "No Ordinal 22\n"); + pSHLWAPI_166 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)166); + ok(pSHLWAPI_166 != 0, "No Ordinal 166\n"); + pSHLWAPI_184 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)184); + ok(pSHLWAPI_184 != 0, "No Ordinal 184\n"); + pSHLWAPI_212 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)212); + ok(pSHLWAPI_212 != 0, "No Ordinal 212\n"); + pSHLWAPI_213 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)213); + ok(pSHLWAPI_213 != 0, "No Ordinal 213\n"); + pSHLWAPI_214 = (void *)GetProcAddress( SHLWAPI_hshlwapi, (LPSTR)214); + ok(pSHLWAPI_214 != 0, "No Ordinal 214\n"); } static void InitDummyStream(_IDummyStream* iface) @@ -637,7 +634,4 @@ START_TEST(clist) test_SHLWAPI_213(); test_SHLWAPI_214(); } - - if (SHLWAPI_hshlwapi) - FreeLibrary(SHLWAPI_hshlwapi); } diff --git a/dlls/shlwapi/tests/clsid.c b/dlls/shlwapi/tests/clsid.c index 8f0830c..74ad6e5 100644 --- a/dlls/shlwapi/tests/clsid.c +++ b/dlls/shlwapi/tests/clsid.c @@ -182,17 +182,10 @@ static void test_CLSIDFromProgIDWrap(void) START_TEST(clsid) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - ok(hShlwapi != 0, "LoadLibraryA failed\n"); - if (hShlwapi) - { - pSHLWAPI_269 = (void*)GetProcAddress(hShlwapi, (LPSTR)269); - pSHLWAPI_23 = (void*)GetProcAddress(hShlwapi, (LPSTR)23); - } + hShlwapi = GetModuleHandleA("shlwapi.dll"); + pSHLWAPI_269 = (void*)GetProcAddress(hShlwapi, (LPSTR)269); + pSHLWAPI_23 = (void*)GetProcAddress(hShlwapi, (LPSTR)23); test_ClassIDs(); test_CLSIDFromProgIDWrap(); - - if (hShlwapi) - FreeLibrary(hShlwapi); } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 0d98ec8..c948274 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -433,10 +433,7 @@ static void test_GetShellSecurityDescriptor(void) START_TEST(ordinal) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - ok(hShlwapi != 0, "LoadLibraryA failed\n"); - if (!hShlwapi) - return; + hShlwapi = GetModuleHandleA("shlwapi.dll"); pGetAcceptLanguagesA = (void*)GetProcAddress(hShlwapi, (LPSTR)14); pSHSearchMapInt = (void*)GetProcAddress(hShlwapi, (LPSTR)198); @@ -450,6 +447,4 @@ START_TEST(ordinal) test_alloc_shared(); test_fdsa(); test_GetShellSecurityDescriptor(); - - FreeLibrary(hShlwapi); } diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index bde40b2..d4ed84d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1833,8 +1833,7 @@ static void test_PathUnquoteSpaces(void) START_TEST(path) { - hShlwapi = LoadLibraryA("shlwapi.dll"); - if (!hShlwapi) return; + hShlwapi = GetModuleHandleA("shlwapi.dll"); test_UrlHash(); test_UrlGetPart();

1 0

Paul Vriens : winecfg: Show version again in About box.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 2d87d2e89e059376933034a651c184c6d2198a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d87d2e89e059376933034a65… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Aug 7 19:16:16 2007 +0200 winecfg: Show version again in About box. --- programs/winecfg/winecfg.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 974cf9b..f83f45e 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "windef.h" #include "winbase.h" #include "wingdi.h"

1 0

Paul Vriens : kernel32/tests: Create paths after checking availability of functions.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: 5cb50202a0445b031689c26d33ccb2eb50892aa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb50202a0445b031689c26d3… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Aug 8 08:46:14 2007 +0200 kernel32/tests: Create paths after checking availability of functions. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 2992c38..5686089 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -1041,12 +1041,12 @@ START_TEST(actctx) argc = winetest_get_mainargs(&argv); - init_paths(); if (!init_funcs()) { skip("Needed functions are not available\n"); return; } + init_paths(); if(argc > 2 && !strcmp(argv[2], "manifest1")) { test_app_manifest();

1 0

Alexandre Julliard : user32: Fixed the return value of DispatchMessageA/W.
by Alexandre Julliard Aug. 8, 2007

Aug. 8, 2007

Module: wine Branch: master Commit: c4245a7fb6a1b4fdaffa7db8c55ec083edbcc75e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4245a7fb6a1b4fdaffa7db8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 7 17:45:10 2007 +0200 user32: Fixed the return value of DispatchMessageA/W. --- dlls/user32/message.c | 8 ++++---- include/winuser.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index bfdd807..a665b12 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2961,10 +2961,10 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) * * See DispatchMessageW. */ -LONG WINAPI DispatchMessageA( const MSG* msg ) +LRESULT WINAPI DispatchMessageA( const MSG* msg ) { WND * wndPtr; - LONG retval; + LRESULT retval; WNDPROC winproc; /* Process timer messages */ @@ -3033,10 +3033,10 @@ LONG WINAPI DispatchMessageA( const MSG* msg ) * ECMA-234, Win32 * */ -LONG WINAPI DispatchMessageW( const MSG* msg ) +LRESULT WINAPI DispatchMessageW( const MSG* msg ) { WND * wndPtr; - LONG retval; + LRESULT retval; WNDPROC winproc; /* Process timer messages */ diff --git a/include/winuser.h b/include/winuser.h index 1c650bc..4297a8d 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4475,8 +4475,8 @@ INT_PTR WINAPI DialogBoxIndirectParamW(HINSTANCE,LPCDLGTEMPLATEW,HWND,DLGPROC, INT_PTR WINAPI DialogBoxParamA(HINSTANCE,LPCSTR,HWND,DLGPROC,LPARAM); INT_PTR WINAPI DialogBoxParamW(HINSTANCE,LPCWSTR,HWND,DLGPROC,LPARAM); #define DialogBoxParam WINELIB_NAME_AW(DialogBoxParam) -LONG WINAPI DispatchMessageA(const MSG*); -LONG WINAPI DispatchMessageW(const MSG*); +LRESULT WINAPI DispatchMessageA(const MSG*); +LRESULT WINAPI DispatchMessageW(const MSG*); #define DispatchMessage WINELIB_NAME_AW(DispatchMessage) INT WINAPI DlgDirListA(HWND,LPSTR,INT,INT,UINT); INT WINAPI DlgDirListW(HWND,LPWSTR,INT,INT,UINT);

1 0