August 2009 - Wine-commits - list.winehq.org

Rico Schüller : d3d10: Implement GetConstantBufferByName.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 2381c0e5608c142a0c060bf8b52e43d18008768a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2381c0e5608c142a0c060bf8b… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 20 19:06:20 2009 +0200 d3d10: Implement GetConstantBufferByName. --- dlls/d3d10/effect.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ed849bb..f40d5fd 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -839,7 +839,21 @@ static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetCon static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_GetConstantBufferByName(ID3D10Effect *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; + + if (!strcmp(l->name, name)) + { + TRACE("Returning buffer %p.\n", l); + return (ID3D10EffectConstantBuffer *)l; + } + } return NULL; }

1 0

Rico Schüller : d3d10: Add ID3D10EffectConstantBufferVtbl.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 91c00c175b7f60df18aec842305baa2705544fdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c00c175b7f60df18aec8423… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 20 19:05:35 2009 +0200 d3d10: Add ID3D10EffectConstantBufferVtbl. --- dlls/d3d10/d3d10_private.h | 2 + dlls/d3d10/effect.c | 268 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 270 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1624c50..535a82d 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -70,6 +70,8 @@ struct d3d10_effect_variable struct d3d10_effect_local_buffer { + const struct ID3D10EffectConstantBufferVtbl *vtbl; + char *name; DWORD data_size; DWORD variable_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 513dad9..ed849bb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; +static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_vtbl; static inline void read_dword(const char **ptr, DWORD *d) { @@ -514,6 +515,7 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d for (i = 0; i < e->local_buffer_count; ++i) { struct d3d10_effect_local_buffer *l = &e->local_buffers[i]; + l->vtbl = &d3d10_effect_constant_buffer_vtbl; hr = parse_fx10_local_buffer(l, &ptr, data); if (FAILED(hr)) return hr; @@ -1406,3 +1408,269 @@ static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl = d3d10_effect_variable_SetRawValue, d3d10_effect_variable_GetRawValue, }; + +/* ID3D10EffectVariable methods */ +static BOOL STDMETHODCALLTYPE d3d10_effect_constant_buffer_IsValid(ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetType(ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetDesc(ID3D10EffectConstantBuffer *iface, + D3D10_EFFECT_VARIABLE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByIndex( + ID3D10EffectConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetAnnotationByName( + ID3D10EffectConstantBuffer *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByIndex( + ID3D10EffectConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberByName( + ID3D10EffectConstantBuffer *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetMemberBySemantic( + ID3D10EffectConstantBuffer *iface, LPCSTR semantic) +{ + FIXME("iface %p, semantic \"%s\" stub!\n", iface, semantic); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetElement( + ID3D10EffectConstantBuffer *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetParentConstantBuffer( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsScalar( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsVector( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsMatrix( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsString( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsShaderResource( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsRenderTargetView( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsDepthStencilView( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsConstantBuffer( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsShader( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsBlend(ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsDepthStencil( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsRasterizer( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_constant_buffer_AsSampler( + ID3D10EffectConstantBuffer *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_SetRawValue(ID3D10EffectConstantBuffer *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetRawValue(ID3D10EffectConstantBuffer *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +/* ID3D10EffectConstantBuffer methods */ +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_SetConstantBuffer(ID3D10EffectConstantBuffer *iface, + ID3D10Buffer *buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetConstantBuffer(ID3D10EffectConstantBuffer *iface, + ID3D10Buffer **buffer) +{ + FIXME("iface %p, buffer %p stub!\n", iface, buffer); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_SetTextureBuffer(ID3D10EffectConstantBuffer *iface, + ID3D10ShaderResourceView *view) +{ + FIXME("iface %p, view %p stub!\n", iface, view); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_constant_buffer_GetTextureBuffer(ID3D10EffectConstantBuffer *iface, + ID3D10ShaderResourceView **view) +{ + FIXME("iface %p, view %p stub!\n", iface, view); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectConstantBufferVtbl d3d10_effect_constant_buffer_vtbl = +{ + /* ID3D10EffectVariable methods */ + d3d10_effect_constant_buffer_IsValid, + d3d10_effect_constant_buffer_GetType, + d3d10_effect_constant_buffer_GetDesc, + d3d10_effect_constant_buffer_GetAnnotationByIndex, + d3d10_effect_constant_buffer_GetAnnotationByName, + d3d10_effect_constant_buffer_GetMemberByIndex, + d3d10_effect_constant_buffer_GetMemberByName, + d3d10_effect_constant_buffer_GetMemberBySemantic, + d3d10_effect_constant_buffer_GetElement, + d3d10_effect_constant_buffer_GetParentConstantBuffer, + d3d10_effect_constant_buffer_AsScalar, + d3d10_effect_constant_buffer_AsVector, + d3d10_effect_constant_buffer_AsMatrix, + d3d10_effect_constant_buffer_AsString, + d3d10_effect_constant_buffer_AsShaderResource, + d3d10_effect_constant_buffer_AsRenderTargetView, + d3d10_effect_constant_buffer_AsDepthStencilView, + d3d10_effect_constant_buffer_AsConstantBuffer, + d3d10_effect_constant_buffer_AsShader, + d3d10_effect_constant_buffer_AsBlend, + d3d10_effect_constant_buffer_AsDepthStencil, + d3d10_effect_constant_buffer_AsRasterizer, + d3d10_effect_constant_buffer_AsSampler, + d3d10_effect_constant_buffer_SetRawValue, + d3d10_effect_constant_buffer_GetRawValue, + /* ID3D10EffectConstantBuffer methods */ + d3d10_effect_constant_buffer_SetConstantBuffer, + d3d10_effect_constant_buffer_GetConstantBuffer, + d3d10_effect_constant_buffer_SetTextureBuffer, + d3d10_effect_constant_buffer_GetTextureBuffer, +};

1 0

Rico Schüller : d3d10: Add annotation skipping.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 033eb8d7cf613818c7cddd072ccb6fc7371014d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=033eb8d7cf613818c7cddd072… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Aug 20 19:02:11 2009 +0200 d3d10: Add annotation skipping. --- dlls/d3d10/d3d10_private.h | 4 ++++ dlls/d3d10/effect.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 60f2aa0..1624c50 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -65,6 +65,7 @@ struct d3d10_effect_variable char *name; DWORD buffer_offset; + DWORD annotation_count; }; struct d3d10_effect_local_buffer @@ -72,6 +73,7 @@ struct d3d10_effect_local_buffer char *name; DWORD data_size; DWORD variable_count; + DWORD annotation_count; struct d3d10_effect_variable *variables; }; @@ -84,6 +86,7 @@ struct d3d10_effect_pass char *name; DWORD start; DWORD object_count; + DWORD annotation_count; struct d3d10_effect_object *objects; }; @@ -95,6 +98,7 @@ struct d3d10_effect_technique struct d3d10_effect *effect; char *name; DWORD pass_count; + DWORD annotation_count; struct d3d10_effect_pass *passes; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 37d2dcb..513dad9 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -249,6 +249,11 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } +static void parse_fx10_annotation(const char **ptr) +{ + skip_dword_unknown(ptr, 3); +} + static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) { const char *data_ptr; @@ -325,7 +330,11 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co read_dword(ptr, &p->object_count); TRACE("Pass has %u effect objects.\n", p->object_count); - skip_dword_unknown(ptr, 1); + read_dword(ptr, &p->annotation_count); + for(i = 0; i < p->annotation_count; ++i) + { + parse_fx10_annotation(ptr); + } p->objects = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, p->object_count * sizeof(*p->objects)); if (!p->objects) @@ -366,7 +375,11 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char read_dword(ptr, &t->pass_count); TRACE("Technique has %u passes\n", t->pass_count); - skip_dword_unknown(ptr, 1); + read_dword(ptr, &t->annotation_count); + for(i = 0; i < t->annotation_count; ++i) + { + parse_fx10_annotation(ptr); + } t->passes = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, t->pass_count * sizeof(*t->passes)); if (!t->passes) @@ -393,6 +406,7 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) { DWORD offset; + unsigned int i; read_dword(ptr, &offset); TRACE("Variable name at offset %#x.\n", offset); @@ -413,7 +427,13 @@ static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char * read_dword(ptr, &v->buffer_offset); TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); - skip_dword_unknown(ptr, 3); + skip_dword_unknown(ptr, 2); + + read_dword(ptr, &v->annotation_count); + for(i = 0; i < v->annotation_count; ++i) + { + parse_fx10_annotation(ptr); + } return S_OK; } @@ -442,7 +462,13 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons read_dword(ptr, &l->variable_count); TRACE("Local buffer variable count: %#x.\n", l->variable_count); - skip_dword_unknown(ptr, 2); + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &l->annotation_count); + for(i = 0; i < l->annotation_count; ++i) + { + parse_fx10_annotation(ptr); + } l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables)); if (!l->variables)

1 0

Damjan Jovanovic : include: Add a basic sti.h.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 174d5c1e7cf940a8efef901ced3344db322d0318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174d5c1e7cf940a8efef901ce… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Aug 20 21:54:29 2009 +0200 include: Add a basic sti.h. --- include/Makefile.in | 1 + include/sti.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 247568c..1127340 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -423,6 +423,7 @@ SRCDIR_INCLUDES = \ sqltypes.h \ srrestoreptapi.h \ sspi.h \ + sti.h \ storage.h \ svrapi.h \ t2embapi.h \ diff --git a/include/sti.h b/include/sti.h new file mode 100644 index 0000000..56650f5 --- /dev/null +++ b/include/sti.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2009 Damjan Jovanovic + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_STI_H +#define __WINE_STI_H + +#include <objbase.h> +/* #include <stireg.h> */ +/* #include <stierr.h> */ + +#include <pshpack8.h> + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(CLSID_Sti, 0xB323F8E0L, 0x2E68, 0x11D0, 0x90, 0xEA, 0x00, 0xAA, 0x00, 0x60, 0xF8, 0x6C); + +#ifdef __cplusplus +}; +#endif + +#include <poppack.h> + +#endif /* __WINE_STI_H */

1 0

Vincent Povirk : gdiplus: Remove an ipicture reference in GdipCreateBitmapFromStream.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 7246a487d9d1a7dcafef9f51815ab710dfe2f2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7246a487d9d1a7dcafef9f518… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 16:43:47 2009 -0500 gdiplus: Remove an ipicture reference in GdipCreateBitmapFromStream. --- dlls/gdiplus/image.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0cdc7ef..7fb76b0 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -646,8 +646,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromStream(IStream* stream, return stat; if((*bitmap)->image.type != ImageTypeBitmap){ - IPicture_Release((*bitmap)->image.picture); - GdipFree(bitmap); + GdipDisposeImage(&(*bitmap)->image); + *bitmap = NULL; return GenericError; /* FIXME: what error to return? */ }

1 0

Vincent Povirk : gdiplus: Do not call IPicture_Render directly from GdipDrawImageI.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: e72defc8f7c9c2e63a352424a9aaccc89a857b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e72defc8f7c9c2e63a352424a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 16:16:05 2009 -0500 gdiplus: Do not call IPicture_Render directly from GdipDrawImageI. --- dlls/gdiplus/graphics.c | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0a8aa45..8bb32f6 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1734,18 +1734,10 @@ GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, REAL y) { - TRACE("(%p, %p, %.2f, %.2f)\n", graphics, image, x, y); - - /* IPicture::Render uses LONG coords */ - return GdipDrawImageI(graphics,image,roundr(x),roundr(y)); -} - -GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, - INT y) -{ - UINT width, height, srcw, srch; + UINT width, height; + GpPointF points[3]; - TRACE("(%p, %p, %d, %d)\n", graphics, image, x, y); + TRACE("(%p, %p, %.2f, %.2f)\n", graphics, image, x, y); if(!graphics || !image) return InvalidParameter; @@ -1753,20 +1745,23 @@ GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, GdipGetImageWidth(image, &width); GdipGetImageHeight(image, &height); - srcw = width * (((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSX))); - srch = height * (((REAL) INCH_HIMETRIC) / - ((REAL) GetDeviceCaps(graphics->hdc, LOGPIXELSY))); + /* FIXME: we should use the graphics and image dpi, somehow */ - if(image->type != ImageTypeMetafile){ - y += height; - height *= -1; - } + points[0].X = points[2].X = x; + points[0].Y = points[1].Y = y; + points[1].X = x + width; + points[2].Y = y + height; - IPicture_Render(image->picture, graphics->hdc, x, y, width, height, - 0, 0, srcw, srch, NULL); + return GdipDrawImagePointsRect(graphics, image, points, 3, 0, 0, width, height, + UnitPixel, NULL, NULL, NULL); +} - return Ok; +GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x, + INT y) +{ + TRACE("(%p, %p, %d, %d)\n", graphics, image, x, y); + + return GdipDrawImage(graphics, image, (REAL)x, (REAL)y); } GpStatus WINGDIPAPI GdipDrawImagePointRect(GpGraphics *graphics, GpImage *image,

1 0

Vincent Povirk : gdiplus: Add codecs for the image formats we can currently decode.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 69ba1415e305f70306f8b8bab9f334b9b206498d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ba1415e305f70306f8b8bab… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 17:59:13 2009 -0500 gdiplus: Add codecs for the image formats we can currently decode. --- dlls/gdiplus/image.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 131 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 630d193..0cdc7ef 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1364,6 +1364,11 @@ typedef struct image_codec { typedef enum { BMP, + JPEG, + GIF, + EMF, + WMF, + ICO, NUM_CODECS } ImageFormat; @@ -1503,6 +1508,41 @@ static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; /* BMP */ static const BYTE bmp_sig_pattern[] = { 0x42, 0x4D }; static const BYTE bmp_sig_mask[] = { 0xFF, 0xFF }; +static const WCHAR jpeg_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'J','P','E','G', 0}; +static const WCHAR jpeg_extension[] = {'*','.','J','P','G',';', '*','.','J','P','E','G',';', '*','.','J','P','E',';', '*','.','J','F','I','F',0}; +static const WCHAR jpeg_mimetype[] = {'i','m','a','g','e','/','j','p','e','g', 0}; +static const WCHAR jpeg_format[] = {'J','P','E','G',0}; +static const BYTE jpeg_sig_pattern[] = { 0xFF, 0xD8 }; +static const BYTE jpeg_sig_mask[] = { 0xFF, 0xFF }; + +static const WCHAR gif_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'G','I','F', 0}; +static const WCHAR gif_extension[] = {'*','.','G','I','F',0}; +static const WCHAR gif_mimetype[] = {'i','m','a','g','e','/','g','i','f', 0}; +static const WCHAR gif_format[] = {'G','I','F',0}; +static const BYTE gif_sig_pattern[4] = "GIF8"; +static const BYTE gif_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; + +static const WCHAR emf_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'E','M','F', 0}; +static const WCHAR emf_extension[] = {'*','.','E','M','F',0}; +static const WCHAR emf_mimetype[] = {'i','m','a','g','e','/','x','-','e','m','f', 0}; +static const WCHAR emf_format[] = {'E','M','F',0}; +static const BYTE emf_sig_pattern[] = { 0x01, 0x00, 0x00, 0x00 }; +static const BYTE emf_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; + +static const WCHAR wmf_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'W','M','F', 0}; +static const WCHAR wmf_extension[] = {'*','.','W','M','F',0}; +static const WCHAR wmf_mimetype[] = {'i','m','a','g','e','/','x','-','w','m','f', 0}; +static const WCHAR wmf_format[] = {'W','M','F',0}; +static const BYTE wmf_sig_pattern[] = { 0xd7, 0xcd }; +static const BYTE wmf_sig_mask[] = { 0xFF, 0xFF }; + +static const WCHAR ico_codecname[] = {'B', 'u', 'i','l', 't', '-','i', 'n', ' ', 'I','C','O', 0}; +static const WCHAR ico_extension[] = {'*','.','I','C','O',0}; +static const WCHAR ico_mimetype[] = {'i','m','a','g','e','/','x','-','i','c','o','n', 0}; +static const WCHAR ico_format[] = {'I','C','O',0}; +static const BYTE ico_sig_pattern[] = { 0x00, 0x00, 0x01, 0x00 }; +static const BYTE ico_sig_mask[] = { 0xFF, 0xFF, 0xFF, 0xFF }; + static const struct image_codec codecs[NUM_CODECS] = { { { /* BMP */ @@ -1521,7 +1561,97 @@ static const struct image_codec codecs[NUM_CODECS] = { /* SigMask */ bmp_sig_mask, }, encode_image_BMP - } + }, + { + { /* JPEG */ + /* Clsid */ { 0x557cf401, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3caeU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ jpeg_codecname, + /* DllName */ NULL, + /* FormatDescription */ jpeg_format, + /* FilenameExtension */ jpeg_extension, + /* MimeType */ jpeg_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 2, + /* SigPattern */ jpeg_sig_pattern, + /* SigMask */ jpeg_sig_mask, + }, + NULL + }, + { + { /* GIF */ + /* Clsid */ { 0x557cf402, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cb0U, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ gif_codecname, + /* DllName */ NULL, + /* FormatDescription */ gif_format, + /* FilenameExtension */ gif_extension, + /* MimeType */ gif_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 4, + /* SigPattern */ gif_sig_pattern, + /* SigMask */ gif_sig_mask, + }, + NULL + }, + { + { /* EMF */ + /* Clsid */ { 0x557cf403, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cacU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ emf_codecname, + /* DllName */ NULL, + /* FormatDescription */ emf_format, + /* FilenameExtension */ emf_extension, + /* MimeType */ emf_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportVector | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 4, + /* SigPattern */ emf_sig_pattern, + /* SigMask */ emf_sig_mask, + }, + NULL + }, + { + { /* WMF */ + /* Clsid */ { 0x557cf404, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cadU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ wmf_codecname, + /* DllName */ NULL, + /* FormatDescription */ wmf_format, + /* FilenameExtension */ wmf_extension, + /* MimeType */ wmf_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportVector | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 2, + /* SigPattern */ wmf_sig_pattern, + /* SigMask */ wmf_sig_mask, + }, + NULL + }, + { + { /* ICO */ + /* Clsid */ { 0x557cf407, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, + /* FormatID */ { 0xb96b3cabU, 0x0728U, 0x11d3U, {0x9d, 0x7b, 0x00, 0x00, 0xf8, 0x1e, 0xf3, 0x2e} }, + /* CodecName */ ico_codecname, + /* DllName */ NULL, + /* FormatDescription */ ico_format, + /* FilenameExtension */ ico_extension, + /* MimeType */ ico_mimetype, + /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Version */ 1, + /* SigCount */ 1, + /* SigSize */ 4, + /* SigPattern */ ico_sig_pattern, + /* SigMask */ ico_sig_mask, + }, + NULL + }, }; /*****************************************************************************

1 0

Vincent Povirk : gdiplus: Only attempt to encode if the Encoder flag is set .
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: b27c3c1983cd5c18d4d82ba5ffba6cd5d51c6391 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b27c3c1983cd5c18d4d82ba5f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 17:36:36 2009 -0500 gdiplus: Only attempt to encode if the Encoder flag is set. --- dlls/gdiplus/image.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c9e5287..630d193 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1409,7 +1409,8 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, /* select correct encoder */ encode_image = NULL; for (i = 0; i < NUM_CODECS; i++) { - if (IsEqualCLSID(clsid, &codecs[i].info.Clsid)) + if ((codecs[i].info.Flags & ImageCodecFlagsEncoder) && + IsEqualCLSID(clsid, &codecs[i].info.Clsid)) encode_image = codecs[i].encode_func; } if (encode_image == NULL)

1 0

Vincent Povirk : gdiplus: Implement GdipGetImageDecoders[Size].
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 40df7dbc0772efa3440a34cf0bd0ad03f17ea534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40df7dbc0772efa3440a34cf0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Aug 20 17:33:39 2009 -0500 gdiplus: Implement GdipGetImageDecoders[Size]. --- dlls/gdiplus/image.c | 72 ++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 55 insertions(+), 17 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index cf48d87..c9e5287 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1364,10 +1364,10 @@ typedef struct image_codec { typedef enum { BMP, - NUM_ENCODERS_SUPPORTED + NUM_CODECS } ImageFormat; -static const struct image_codec codecs[NUM_ENCODERS_SUPPORTED]; +static const struct image_codec codecs[NUM_CODECS]; /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] @@ -1408,7 +1408,7 @@ GpStatus WINGDIPAPI GdipSaveImageToStream(GpImage *image, IStream* stream, /* select correct encoder */ encode_image = NULL; - for (i = 0; i < NUM_ENCODERS_SUPPORTED; i++) { + for (i = 0; i < NUM_CODECS; i++) { if (IsEqualCLSID(clsid, &codecs[i].info.Clsid)) encode_image = codecs[i].encode_func; } @@ -1502,7 +1502,7 @@ static const WCHAR bmp_format[] = {'B', 'M', 'P', 0}; /* BMP */ static const BYTE bmp_sig_pattern[] = { 0x42, 0x4D }; static const BYTE bmp_sig_mask[] = { 0xFF, 0xFF }; -static const struct image_codec codecs[NUM_ENCODERS_SUPPORTED] = { +static const struct image_codec codecs[NUM_CODECS] = { { { /* BMP */ /* Clsid */ { 0x557cf400, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } }, @@ -1528,13 +1528,21 @@ static const struct image_codec codecs[NUM_ENCODERS_SUPPORTED] = { */ GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT *numDecoders, UINT *size) { - FIXME("%p %p stub!\n", numDecoders, size); + int decoder_count=0; + int i; + TRACE("%p %p\n", numDecoders, size); if (!numDecoders || !size) return InvalidParameter; - *numDecoders = 0; - *size = 0; + for (i=0; i<NUM_CODECS; i++) + { + if (codecs[i].info.Flags & ImageCodecFlagsDecoder) + decoder_count++; + } + + *numDecoders = decoder_count; + *size = decoder_count * sizeof(ImageCodecInfo); return Ok; } @@ -1544,12 +1552,26 @@ GpStatus WINGDIPAPI GdipGetImageDecodersSize(UINT *numDecoders, UINT *size) */ GpStatus WINGDIPAPI GdipGetImageDecoders(UINT numDecoders, UINT size, ImageCodecInfo *decoders) { - FIXME("%u %u %p stub!\n", numDecoders, size, decoders); + int i, decoder_count=0; + TRACE("%u %u %p\n", numDecoders, size, decoders); - if (!decoders) + if (!decoders || + size != numDecoders * sizeof(ImageCodecInfo)) return GenericError; - return NotImplemented; + for (i=0; i<NUM_CODECS; i++) + { + if (codecs[i].info.Flags & ImageCodecFlagsDecoder) + { + if (decoder_count == numDecoders) return GenericError; + memcpy(&decoders[decoder_count], &codecs[i].info, sizeof(ImageCodecInfo)); + decoder_count++; + } + } + + if (decoder_count < numDecoders) return GenericError; + + return Ok; } /***************************************************************************** @@ -1557,13 +1579,21 @@ GpStatus WINGDIPAPI GdipGetImageDecoders(UINT numDecoders, UINT size, ImageCodec */ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) { + int encoder_count=0; + int i; TRACE("%p %p\n", numEncoders, size); if (!numEncoders || !size) return InvalidParameter; - *numEncoders = NUM_ENCODERS_SUPPORTED; - *size = NUM_ENCODERS_SUPPORTED * sizeof(ImageCodecInfo); + for (i=0; i<NUM_CODECS; i++) + { + if (codecs[i].info.Flags & ImageCodecFlagsEncoder) + encoder_count++; + } + + *numEncoders = encoder_count; + *size = encoder_count * sizeof(ImageCodecInfo); return Ok; } @@ -1573,16 +1603,24 @@ GpStatus WINGDIPAPI GdipGetImageEncodersSize(UINT *numEncoders, UINT *size) */ GpStatus WINGDIPAPI GdipGetImageEncoders(UINT numEncoders, UINT size, ImageCodecInfo *encoders) { - int i; + int i, encoder_count=0; TRACE("%u %u %p\n", numEncoders, size, encoders); if (!encoders || - (numEncoders != NUM_ENCODERS_SUPPORTED) || - (size != NUM_ENCODERS_SUPPORTED * sizeof(ImageCodecInfo))) + size != numEncoders * sizeof(ImageCodecInfo)) return GenericError; - for (i=0; i<NUM_ENCODERS_SUPPORTED; i++) - memcpy(&encoders[i], &codecs[i].info, sizeof(ImageCodecInfo)); + for (i=0; i<NUM_CODECS; i++) + { + if (codecs[i].info.Flags & ImageCodecFlagsEncoder) + { + if (encoder_count == numEncoders) return GenericError; + memcpy(&encoders[encoder_count], &codecs[i].info, sizeof(ImageCodecInfo)); + encoder_count++; + } + } + + if (encoder_count < numEncoders) return GenericError; return Ok; }

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in TRACE_STRIDED.
by Alexandre Julliard 21 Aug '09

21 Aug '09

Module: wine Branch: master Commit: 0c4201d5fd4c746347bc214ebd808bc7115d6daa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c4201d5fd4c746347bc214eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 21 09:12:30 2009 +0200 wined3d: Properly check if an attribute is used in TRACE_STRIDED. --- dlls/wined3d/wined3d_private.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 44bb10e..3627078 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -941,10 +941,11 @@ do { \ } while(0) /* Trace vector and strided data information */ -#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w); -#define TRACE_STRIDED(si, name) TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ +#define TRACE_VECTOR(name) TRACE( #name "=(%f, %f, %f, %f)\n", name.x, name.y, name.z, name.w) +#define TRACE_STRIDED(si, name) do { if (si->use_map & (1 << name)) \ + TRACE( #name "=(data:%p, stride:%d, format:%#x, vbo %d, stream %u)\n", \ si->elements[name].data, si->elements[name].stride, si->elements[name].format_desc->format, \ - si->elements[name].buffer_object, si->elements[name].stream_idx); + si->elements[name].buffer_object, si->elements[name].stream_idx); } while(0) /* Defines used for optimizations */

1 0