wine-commits January 2010

wine-commits@winehq.org

3 participants
615 discussions

Henri Verbeet : wined3d: Add support for source and destination rectangles to swapchain_blit().
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b5907e23cc595de1f0aba2a615c8c4510b433d36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5907e23cc595de1f0aba2a61… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:25 2010 +0100 wined3d: Add support for source and destination rectangles to swapchain_blit(). --- dlls/wined3d/swapchain.c | 51 ++++++++++++++++++++++++++++----------------- 1 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 445fbbf..c6b0b01 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -96,19 +96,23 @@ static void WINAPI IWineD3DSwapChainImpl_Destroy(IWineD3DSwapChain *iface) } /* A GL context is provided by the caller */ -static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context) +static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context *context, + const RECT *src_rect, const RECT *dst_rect) { - RECT window; IWineD3DDeviceImpl *device = This->device; IWineD3DSurfaceImpl *backbuffer = ((IWineD3DSurfaceImpl *) This->backBuffer[0]); - UINT w = backbuffer->currentDesc.Width; - UINT h = backbuffer->currentDesc.Height; + UINT src_w = src_rect->right - src_rect->left; + UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; const struct wined3d_gl_info *gl_info = context->gl_info; - GetClientRect(This->win_handle, &window); - if(w == window.right && h == window.bottom) gl_filter = GL_NEAREST; - else gl_filter = GL_LINEAR; + TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", + This, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); + + if (src_w == dst_rect->right - dst_rect->left && src_h == dst_rect->bottom - dst_rect->top) + gl_filter = GL_NEAREST; + else + gl_filter = GL_LINEAR; if (gl_info->fbo_ops.glBlitFramebuffer) { @@ -124,8 +128,8 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co IWineD3DDeviceImpl_MarkStateDirty(This->device, STATE_RENDER(WINED3DRS_SCISSORTESTENABLE)); /* Note that the texture is upside down */ - gl_info->fbo_ops.glBlitFramebuffer(0, 0, w, h, - window.left, window.bottom, window.right, window.top, + gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, + dst_rect->left, dst_rect->bottom, dst_rect->right, dst_rect->top, GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); LEAVE_GL(); @@ -133,19 +137,19 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co else { struct wined3d_context *context2; - float tex_left = 0; - float tex_top = 0; - float tex_right = w; - float tex_bottom = h; + float tex_left = src_rect->left; + float tex_top = src_rect->top; + float tex_right = src_rect->right; + float tex_bottom = src_rect->bottom; context2 = context_acquire(This->device, This->backBuffer[0], CTXUSAGE_BLIT); if(backbuffer->Flags & SFLAG_NORMCOORD) { - tex_left /= w; - tex_right /= w; - tex_top /= h; - tex_bottom /= h; + tex_left /= src_w; + tex_right /= src_w; + tex_top /= src_h; + tex_bottom /= src_h; } ENTER_GL(); @@ -171,7 +175,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co * size - we want the GL drawable(=window) size. */ glPushAttrib(GL_VIEWPORT_BIT); - glViewport(window.left, window.top, window.right, window.bottom); + glViewport(dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); @@ -208,6 +212,7 @@ static inline void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_co static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; struct wined3d_context *context; + RECT src_rect, dst_rect; unsigned int sync; int retval; @@ -316,7 +321,15 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO { FIXME("Render-to-fbo with WINED3DSWAPEFFECT_FLIP\n"); } - swapchain_blit(This, context); + + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = This->presentParms.BackBufferWidth; + src_rect.bottom = This->presentParms.BackBufferHeight; + + GetClientRect(This->win_handle, &dst_rect); + + swapchain_blit(This, context, &src_rect, &dst_rect); } SwapBuffers(This->context[0]->hdc); /* TODO: cycle through the swapchain buffers */

1 0

Henri Verbeet : d3d10core: Add a wined3d geoemtry shader to struct d3d10_geometry_shader.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 73c6355d75b4cc0c415f02bfc6f4b6818fd0df35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c6355d75b4cc0c415f02bfc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:24 2010 +0100 d3d10core: Add a wined3d geoemtry shader to struct d3d10_geometry_shader. --- dlls/d3d10core/d3d10core_private.h | 6 ++++- dlls/d3d10core/device.c | 3 +- dlls/d3d10core/shader.c | 38 ++++++++++++++++++++++++++++++++++- 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 058d8dc..d0bc584 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -168,9 +168,13 @@ struct d3d10_geometry_shader { const struct ID3D10GeometryShaderVtbl *vtbl; LONG refcount; + + IWineD3DGeometryShader *wined3d_shader; + struct wined3d_shader_signature output_signature; }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader); +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) DECLSPEC_HIDDEN; /* ID3D10PixelShader */ struct d3d10_pixel_shader diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 39be2ef..191e681 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -848,6 +848,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateVertexShader(ID3D10Device *i static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D10GeometryShader **shader) { + struct d3d10_device *This = (struct d3d10_device *)iface; struct d3d10_geometry_shader *object; HRESULT hr; @@ -861,7 +862,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShader(ID3D10Device return E_OUTOFMEMORY; } - hr = d3d10_geometry_shader_init(object); + hr = d3d10_geometry_shader_init(object, This, byte_code, byte_code_length); if (FAILED(hr)) { WARN("Failed to initialize geometry shader, hr %#x.\n", hr); diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index e8602b5..256f281 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -313,7 +313,7 @@ static ULONG STDMETHODCALLTYPE d3d10_geometry_shader_Release(ID3D10GeometryShade if (!refcount) { - HeapFree(GetProcessHeap(), 0, This); + IWineD3DGeometryShader_Release(This->wined3d_shader); } return refcount; @@ -365,11 +365,45 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = d3d10_geometry_shader_SetPrivateDataInterface, }; -HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader) +static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_geometry_shader *shader = parent; + shader_free_signature(&shader->output_signature); + HeapFree(GetProcessHeap(), 0, shader); +} + +static const struct wined3d_parent_ops d3d10_geometry_shader_wined3d_parent_ops = +{ + d3d10_geometry_shader_wined3d_object_destroyed, +}; + +HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct d3d10_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct d3d10_shader_info shader_info; + HRESULT hr; + shader->vtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; + shader_info.output_signature = &shader->output_signature; + hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info); + if (FAILED(hr)) + { + ERR("Failed to extract shader, hr %#x.\n", hr); + return hr; + } + + hr = IWineD3DDevice_CreateGeometryShader(device->wined3d_device, + shader_info.shader_code, &shader->output_signature, &shader->wined3d_shader, + (IUnknown *)shader, &d3d10_geometry_shader_wined3d_parent_ops); + if (FAILED(hr)) + { + WARN("Failed to create wined3d vertex shader, hr %#x.\n", hr); + shader_free_signature(&shader->output_signature); + return hr; + } + return S_OK; }

1 0

Henri Verbeet : wined3d: Add a geometry shader object.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 41401fb8cffb895b66648ed31fb5266e8121d665 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41401fb8cffb895b66648ed31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:23 2010 +0100 wined3d: Add a geometry shader object. This is just the object used to store the byte code, the shader compiler doesn't know how to handle geometry shaders yet. --- dlls/wined3d/device.c | 31 +++++++++++++ dlls/wined3d/shader.c | 98 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 10 ++++ include/wine/wined3d.idl | 16 +++++++ 4 files changed, 155 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0660b4..78db960 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1181,6 +1181,36 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac return WINED3D_OK; } +static HRESULT WINAPI IWineD3DDeviceImpl_CreateGeometryShader(IWineD3DDevice *iface, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IWineD3DGeometryShader **shader, IUnknown *parent, + const struct wined3d_parent_ops *parent_ops) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + struct wined3d_geometryshader *object; + HRESULT hr; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); + if (!object) + { + ERR("Failed to allocate shader memory.\n"); + return E_OUTOFMEMORY; + } + + hr = geometryshader_init(object, This, byte_code, output_signature, parent, parent_ops); + if (FAILED(hr)) + { + WARN("Failed to initialize geometry shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created geometry shader %p.\n", object); + *shader = (IWineD3DGeometryShader *)object; + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DDeviceImpl_CreatePixelShader(IWineD3DDevice *iface, const DWORD *pFunction, const struct wined3d_shader_signature *output_signature, IWineD3DPixelShader **ppPixelShader, IUnknown *parent, @@ -6804,6 +6834,7 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_CreateVertexDeclaration, IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF, IWineD3DDeviceImpl_CreateVertexShader, + IWineD3DDeviceImpl_CreateGeometryShader, IWineD3DDeviceImpl_CreatePixelShader, IWineD3DDeviceImpl_CreatePalette, /*** Odd functions **/ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 01ddfe6..398ea64 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -400,6 +400,104 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * return WINED3D_OK; } +static HRESULT STDMETHODCALLTYPE geometryshader_QueryInterface(IWineD3DGeometryShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_IWineD3DGeometryShader) + || IsEqualGUID(riid, &IID_IWineD3DBaseShader) + || IsEqualGUID(riid, &IID_IWineD3DBase) + || IsEqualGUID(riid, &IID_IUnknown)) + { + IUnknown_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE geometryshader_AddRef(IWineD3DGeometryShader *iface) +{ + struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; + ULONG refcount = InterlockedIncrement(&shader->base_shader.ref); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE geometryshader_Release(IWineD3DGeometryShader *iface) +{ + struct wined3d_geometryshader *shader = (struct wined3d_geometryshader *)iface; + ULONG refcount = InterlockedDecrement(&shader->base_shader.ref); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + shader_cleanup((IWineD3DBaseShader *)iface); + shader->base_shader.parent_ops->wined3d_object_destroyed(shader->base_shader.parent); + HeapFree(GetProcessHeap(), 0, shader); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE geometryshader_GetParent(IWineD3DGeometryShader *iface, IUnknown **parent) +{ + TRACE("iface %p, parent %p.\n", iface, parent); + + shader_get_parent((IWineD3DBaseShaderImpl *)iface, parent); + + return WINED3D_OK; +} + +static HRESULT STDMETHODCALLTYPE geometryshader_GetFunction(IWineD3DGeometryShader *iface, void *data, UINT *data_size) +{ + TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size); + + return shader_get_function((IWineD3DBaseShaderImpl *)iface, data, data_size); +} + +static const IWineD3DGeometryShaderVtbl wined3d_geometryshader_vtbl = +{ + /* IUnknown methods */ + geometryshader_QueryInterface, + geometryshader_AddRef, + geometryshader_Release, + /* IWineD3DBase methods */ + geometryshader_GetParent, + /* IWineD3DBaseShader methods */ + geometryshader_GetFunction, +}; + +HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; + + shader->vtbl = &wined3d_geometryshader_vtbl; + shader_init(&shader->base_shader, device, parent, parent_ops); + + hr = shader_set_function((IWineD3DBaseShaderImpl *)shader, byte_code, output_signature, 0); + if (FAILED(hr)) + { + WARN("Failed to set function, hr %#x.\n", hr); + shader_cleanup((IWineD3DBaseShader *)shader); + return hr; + } + + shader->base_shader.load_local_constsF = FALSE; + + return WINED3D_OK; +} + static HRESULT STDMETHODCALLTYPE pixelshader_QueryInterface(IWineD3DPixelShader *iface, REFIID riid, void **object) { TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3cb0942..e95cbdf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2749,6 +2749,16 @@ HRESULT vertexshader_init(IWineD3DVertexShaderImpl *shader, IWineD3DDeviceImpl * const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +struct wined3d_geometryshader +{ + const struct IWineD3DGeometryShaderVtbl *vtbl; + IWineD3DBaseShaderClass base_shader; +}; + +HRESULT geometryshader_init(struct wined3d_geometryshader *shader, IWineD3DDeviceImpl *device, + const DWORD *byte_code, const struct wined3d_shader_signature *output_signature, + IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; + /***************************************************************************** * IDirect3DPixelShader implementation structure */ diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 7c44b5e..16ae443 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2844,6 +2844,15 @@ interface IWineD3DVertexShader : IWineD3DBaseShader [ object, local, + uuid(8276c113-388b-49d1-ad8b-c9dd8bcbabcd) +] +interface IWineD3DGeometryShader : IWineD3DBaseShader +{ +} + +[ + object, + local, uuid(818503da-6f30-11d9-c687-00046142c14f) ] interface IWineD3DPixelShader : IWineD3DBaseShader @@ -2981,6 +2990,13 @@ interface IWineD3DDevice : IWineD3DBase [in] IUnknown *parent, [in] const struct wined3d_parent_ops *parent_ops ); + HRESULT CreateGeometryShader( + [in] const DWORD *byte_code, + [in] const struct wined3d_shader_signature *output_signature, + [out] IWineD3DGeometryShader **shader, + [in] IUnknown *parent, + [in] const struct wined3d_parent_ops *parent_ops + ); HRESULT CreatePixelShader( [in] const DWORD *function, [in] const struct wined3d_shader_signature *output_signature,

1 0

Henri Verbeet : wined3d: Move "wrap_lookup" to struct wined3d_gl_info.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: f50b4c7d71c8074d0b29b2e9176329bf004942c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f50b4c7d71c8074d0b29b2e91… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 3 21:18:22 2010 +0100 wined3d: Move "wrap_lookup" to struct wined3d_gl_info. --- dlls/wined3d/basetexture.c | 17 ++++++++--------- dlls/wined3d/directx.c | 12 +++++------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 7 +++---- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index e671ec4..f3c3fe7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -323,7 +323,8 @@ HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surfac } /* GL locking is done by the caller */ -static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) +static void apply_wrap(const struct wined3d_gl_info *gl_info, GLenum target, + WINED3DTEXTUREADDRESS d3d_wrap, GLenum param, BOOL cond_np2) { GLint gl_wrap; @@ -341,7 +342,7 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par } else { - gl_wrap = wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; + gl_wrap = gl_info->wrap_lookup[d3d_wrap - WINED3DTADDRESS_WRAP]; } TRACE("Setting param %#x to %#x for target %#x.\n", param, gl_wrap, target); @@ -352,7 +353,8 @@ static void apply_wrap(GLenum target, WINED3DTEXTUREADDRESS d3d_wrap, GLenum par /* GL locking is done by the caller (state handler) */ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1]) + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) { IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; DWORD state; @@ -373,19 +375,19 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if(samplerStates[WINED3DSAMP_ADDRESSU] != gl_tex->states[WINED3DTEXSTA_ADDRESSU]) { state = samplerStates[WINED3DSAMP_ADDRESSU]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_S, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSU] = state; } if(samplerStates[WINED3DSAMP_ADDRESSV] != gl_tex->states[WINED3DTEXSTA_ADDRESSV]) { state = samplerStates[WINED3DSAMP_ADDRESSV]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_T, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSV] = state; } if(samplerStates[WINED3DSAMP_ADDRESSW] != gl_tex->states[WINED3DTEXSTA_ADDRESSW]) { state = samplerStates[WINED3DSAMP_ADDRESSW]; - apply_wrap(textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); + apply_wrap(gl_info, textureDimensions, state, GL_TEXTURE_WRAP_R, cond_np2); gl_tex->states[WINED3DTEXSTA_ADDRESSW] = state; } @@ -475,9 +477,6 @@ void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, if (gl_tex->states[WINED3DTEXSTA_MAXANISOTROPY] != aniso) { - IWineD3DDeviceImpl *device = This->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - if (gl_info->supported[EXT_TEXTURE_FILTER_ANISOTROPIC]) { glTexParameteri(textureDimensions, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 487b435..e0e6880 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,8 +156,6 @@ static const struct { static HRESULT WINAPI IWineD3DImpl_CheckDeviceFormat(IWineD3D *iface, UINT Adapter, WINED3DDEVTYPE DeviceType, WINED3DFORMAT AdapterFormat, DWORD Usage, WINED3DRESOURCETYPE RType, WINED3DFORMAT CheckFormat, WINED3DSURFTYPE SurfaceType); -GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; - const struct min_lookup minMipLookup[] = { /* NONE POINT LINEAR */ @@ -2123,13 +2121,13 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, str else gl_info->vidmem = WINE_DEFAULT_VIDMEM; - wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_WRAP - WINED3DTADDRESS_WRAP] = GL_REPEAT; + gl_info->wrap_lookup[WINED3DTADDRESS_MIRROR - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_MIRRORED_REPEAT] ? GL_MIRRORED_REPEAT_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; - wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_CLAMP - WINED3DTADDRESS_WRAP] = GL_CLAMP_TO_EDGE; + gl_info->wrap_lookup[WINED3DTADDRESS_BORDER - WINED3DTADDRESS_WRAP] = gl_info->supported[ARB_TEXTURE_BORDER_CLAMP] ? GL_CLAMP_TO_BORDER_ARB : GL_REPEAT; - wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = + gl_info->wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP] = gl_info->supported[ATI_TEXTURE_MIRROR_ONCE] ? GL_MIRROR_CLAMP_TO_EDGE_ATI : GL_REPEAT; /* Make sure there's an active HDC else the WGL extensions will fail */ diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 8078118..e984529 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3520,7 +3520,7 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wine tex_impl->baseTexture.internal_preload(stateblock->textures[sampler], srgb ? SRGB_SRGB : SRGB_RGB); IWineD3DBaseTexture_BindTexture(stateblock->textures[sampler], srgb); basetexture_apply_state_changes(stateblock->textures[sampler], - stateblock->textureState[sampler], stateblock->samplerState[sampler]); + stateblock->textureState[sampler], stateblock->samplerState[sampler], gl_info); if (context->gl_info->supported[EXT_TEXTURE_LOD_BIAS]) { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 4eb57d2..49f8114 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4101,6 +4101,7 @@ struct wined3d_gl_info DWORD reserved_glsl_constants; DWORD quirks; BOOL supported[WINED3D_GL_EXT_COUNT]; + GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1]; struct wined3d_fbo_ops fbo_ops; /* GL function pointers */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 361967b..3cb0942 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -149,8 +149,6 @@ void wined3d_rb_free(void *ptr) DECLSPEC_HIDDEN; #define MAX_ACTIVE_LIGHTS 8 #define MAX_CLIPPLANES WINED3DMAXUSERCLIPPLANES -extern GLint wrap_lookup[WINED3DTADDRESS_MIRRORONCE - WINED3DTADDRESS_WRAP + 1] DECLSPEC_HIDDEN; - struct min_lookup { GLenum mip[WINED3DTEXF_LINEAR + 1]; @@ -1758,8 +1756,9 @@ typedef struct IWineD3DBaseTextureImpl } IWineD3DBaseTextureImpl; void basetexture_apply_state_changes(IWineD3DBaseTexture *iface, - const DWORD texture_states[WINED3D_HIGHEST_TEXTURE_STATE + 1], - const DWORD sampler_states[WINED3D_HIGHEST_SAMPLER_STATE + 1]) DECLSPEC_HIDDEN; + const DWORD textureStates[WINED3D_HIGHEST_TEXTURE_STATE + 1], + const DWORD samplerStates[WINED3D_HIGHEST_SAMPLER_STATE + 1], + const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; HRESULT basetexture_bind(IWineD3DBaseTexture *iface, BOOL srgb, BOOL *set_surface_desc) DECLSPEC_HIDDEN; void basetexture_cleanup(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN; void basetexture_generate_mipmaps(IWineD3DBaseTexture *iface) DECLSPEC_HIDDEN;

1 0

Dan Kegel : cmd: Fix echoing of multiline commands.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: b6e8e135996cbd0b4ed3f5d6292e9a8f70c69ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6e8e135996cbd0b4ed3f5d62… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:04:05 2010 -0800 cmd: Fix echoing of multiline commands. --- programs/cmd/wcmdmain.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d5ef48c..e94cb3b 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1269,13 +1269,6 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, handleExpansion(new_redir, (context != NULL), forVariable, forValue); cmd = new_cmd; - /* Show prompt before batch line IF echo is on and in batch program */ - if (context && echo_mode && (cmd[0] != '@')) { - WCMD_show_prompt(); - WCMD_output_asis ( cmd); - WCMD_output_asis ( newline); - } - /* * Changing default drive has to be handled as a special case. */ @@ -1774,6 +1767,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* Replace env vars if in a batch context */ if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Show prompt before batch line IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_show_prompt(); + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } /* Start with an empty string, copying to the command string */ curStringLen = 0; @@ -2106,6 +2105,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); + /* Continue to echo commands IF echo is on and in batch program */ + if (context && echo_mode && extraSpace[0] && (extraSpace[0] != '@')) { + WCMD_output_asis(extraSpace); + WCMD_output_asis(newline); + } } }

1 0

Dan Kegel : cmd: Echoed prompts are preceded by a blank line.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 27235ecb65408a23ca61dd64202abcd9b8df8c28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27235ecb65408a23ca61dd642… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Jan 2 17:00:45 2010 -0800 cmd: Echoed prompts are preceded by a blank line. --- programs/cmd/wcmdmain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 5f3a0ca..d5ef48c 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -325,6 +325,8 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; + *q++ = '\r'; + *q++ = '\n'; *q = '\0'; while (*p != '\0') { if (*p != '$') {

1 0

Vincent Povirk : ole32: Remove fixme for transacted mode.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 0debd2fef4c7bb9778d14d77faf9062bb8828c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0debd2fef4c7bb9778d14d77f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Jan 3 11:29:42 2010 -0600 ole32: Remove fixme for transacted mode. --- dlls/ole32/storage32.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index e000535..0e78a6d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -6355,9 +6355,6 @@ HRESULT WINAPI StgCreateDocfile( if (STGM_SHARE_MODE(grfMode) && !(grfMode & STGM_SHARE_DENY_NONE)) FIXME("Storage share mode not implemented.\n"); - if (grfMode & STGM_TRANSACTED) - FIXME("Transacted mode not implemented.\n"); - *ppstgOpen = 0; hFile = CreateFileW(pwcsName,

1 0

André Hentschel : comctl32: Improve German translation .
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 9d9c4061f9775cf6f2746dc98ee1a9d5975280bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d9c4061f9775cf6f2746dc98… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 1 18:27:59 2010 +0100 comctl32: Improve German translation. --- dlls/comctl32/comctl_De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/comctl_De.rc b/dlls/comctl32/comctl_De.rc index 4a94f23..87730c8 100644 --- a/dlls/comctl32/comctl_De.rc +++ b/dlls/comctl32/comctl_De.rc @@ -63,7 +63,7 @@ FONT 8, "MS Shell Dlg" BEGIN PUSHBUTTON "< &Zurück", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "&Beenden", IDC_FINISH_BUTTON,121,138,50,14 + DEFPUSHBUTTON "&Fertig", IDC_FINISH_BUTTON,121,138,50,14 PUSHBUTTON "Abbrechen", IDCANCEL,178,138,50,14 PUSHBUTTON "&Hilfe", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN

1 0

Nikolay Sivov : comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT.
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: d7b7f783ab8af0d717c7968a331233917e4c11b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7b7f783ab8af0d717c7968a3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 1 18:50:45 2010 +0300 comdlg32/tests: Free global blocks after PrintDlg() with PD_RETURNDEFAULT. --- dlls/comdlg32/tests/printdlg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 4e189ee..61eefa6 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -323,6 +323,8 @@ static void test_abort_proc(void) ok(DeleteFileA(filename), "Failed to delete temporary file\n"); return; } + GlobalFree(pd.hDevMode); + GlobalFree(pd.hDevNames); ok(pd.hDC != NULL, "PrintDlg didn't return a DC.\n"); if (!(print_dc = pd.hDC))

1 0

Andrew Eikum : hlink/tests: Fix some memory leaks (valgrind).
by Alexandre Julliard 04 Jan '10

04 Jan '10

Module: wine Branch: master Commit: 4fec073d49ccd2534c04c30e01517410fc138941 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fec073d49ccd2534c04c30e0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Dec 31 16:37:30 2009 -0600 hlink/tests: Fix some memory leaks (valgrind). --- dlls/hlink/tests/browse_ctx.c | 3 +++ dlls/hlink/tests/hlink.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/hlink/tests/browse_ctx.c b/dlls/hlink/tests/browse_ctx.c index 483f604..a9b26e7 100644 --- a/dlls/hlink/tests/browse_ctx.c +++ b/dlls/hlink/tests/browse_ctx.c @@ -70,6 +70,9 @@ static void test_SetInitialHlink(void) ok(hres == S_OK, "GetDisplayName failed: 0x%08x\n", hres); ok(!strcmp_ww(found_name, exp_name), "Found display name should have been %s, was: %s\n", wine_dbgstr_w(exp_name), wine_dbgstr_w(found_name)); + CoTaskMemFree(exp_name); + CoTaskMemFree(found_name); + IBindCtx_Release(bindctx); IMoniker_Release(found_moniker); IHlink_Release(found_hlink); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 6a67f59..1802196 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -1138,6 +1138,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, HLINKSETF_LOCATION, one, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1146,6 +1148,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_LOCATION, two, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1154,6 +1158,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting target */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET, two, three); @@ -1163,6 +1169,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, two), "Found target should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, one), "Found location should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -HLINKSETF_TARGET, three, two); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1171,6 +1179,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test setting/getting both */ hres = IHlink_SetStringReference(link, HLINKSETF_TARGET | HLINKSETF_LOCATION, one, two); @@ -1180,6 +1190,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, one), "Found target should have been %s, was: %s\n", wine_dbgstr_w(one), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, -(HLINKSETF_TARGET | HLINKSETF_LOCATION), three, one); ok(hres == S_OK, "IHlink_SetStringReference failed: 0x%08x\n", hres); @@ -1188,6 +1200,8 @@ static void test_HlinkGetSetStringReference(void) ok(hres == S_OK, "IHlink_GetStringReference failed: 0x%08x\n", hres); ok(!lstrcmpW(fnd_tgt, three), "Found target should have been %s, was: %s\n", wine_dbgstr_w(three), wine_dbgstr_w(fnd_tgt)); ok(!lstrcmpW(fnd_loc, two), "Found location should have been %s, was: %s\n", wine_dbgstr_w(two), wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); /* test invalid flags/params */ hres = IHlink_GetStringReference(link, 4, &fnd_tgt, &fnd_loc); @@ -1195,14 +1209,20 @@ static void test_HlinkGetSetStringReference(void) "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); ok(fnd_tgt == NULL, "Found target should have been NULL, was: %s\n", wine_dbgstr_w(fnd_tgt)); ok(fnd_loc == NULL, "Found location should have been NULL, was: %s\n", wine_dbgstr_w(fnd_loc)); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -1, &fnd_tgt, &fnd_loc); todo_wine ok(hres == E_FAIL, "IHlink_GetStringReference should have failed " "with E_FAIL (0x%08x), instead: 0x%08x\n", E_FAIL, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_GetStringReference(link, -2, &fnd_tgt, &fnd_loc); ok(hres == E_INVALIDARG, "IHlink_GetStringReference should have failed " "with E_INVALIDARG (0x%08x), instead: 0x%08x\n", E_INVALIDARG, hres); + CoTaskMemFree(fnd_tgt); + CoTaskMemFree(fnd_loc); hres = IHlink_SetStringReference(link, 4, NULL, NULL); ok(hres == 4, "IHlink_SetStringReference should have failed with 0x4, instead: 0x%08x\n", hres);

1 0

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-commits January 2010