wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Matteo Bruni : include: Fix some d3d10shader.h defines.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: a9e792d6d342c8a68f8802b549fd50de11f77153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e792d6d342c8a68f8802b54… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Fix some d3d10shader.h defines. --- include/d3d10shader.h | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 7885bbd..592dd18 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -32,10 +32,16 @@ #define D3D10_SHADER_FORCE_PS_SOFTWARE_NO_OPT 0x0080 #define D3D10_SHADER_NO_PRESHADER 0x0100 #define D3D10_SHADER_AVOID_FLOW_CONTROL 0x0200 -#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0300 -#define D3D10_SHADER_ENABLE_STRICTNESS 0x0400 -#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x0800 -#define D3D10_SHADER_IEEE_STRICTNESS 0x1000 +#define D3D10_SHADER_PREFER_FLOW_CONTROL 0x0400 +#define D3D10_SHADER_ENABLE_STRICTNESS 0x0800 +#define D3D10_SHADER_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3D10_SHADER_IEEE_STRICTNESS 0x2000 +#define D3D10_SHADER_WARNINGS_ARE_ERRORS 0x40000 + +#define D3D10_SHADER_OPTIMIZATION_LEVEL0 0x4000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL1 0x0000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL2 0xC000 +#define D3D10_SHADER_OPTIMIZATION_LEVEL3 0x8000 typedef enum _D3D10_SHADER_VARIABLE_CLASS {

1 0

Matteo Bruni : include: Add some d3dcompiler-related definitions.
by Alexandre Julliard 04 Aug '10

04 Aug '10

Module: wine Branch: master Commit: 392804b1c813b591b631c7c1038181898f0e550d URL: http://source.winehq.org/git/wine.git/?a=commit;h=392804b1c813b591b631c7c10… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Add some d3dcompiler-related definitions. --- include/d3dcommon.idl | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index b9cdf0e..6cba9d2 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -19,6 +19,14 @@ import "oaidl.idl"; import "ocidl.idl"; +typedef struct _D3D_SHADER_MACRO +{ + LPCSTR Name; + LPCSTR Definition; +} D3D_SHADER_MACRO; + +typedef struct _D3D_SHADER_MACRO* LPD3D_SHADER_MACRO; + [ object, local, @@ -33,3 +41,28 @@ interface ID3D10Blob : IUnknown typedef ID3D10Blob* LPD3D10BLOB; typedef ID3D10Blob ID3DBlob; typedef ID3DBlob* LPD3DBLOB; + +typedef enum _D3D_INCLUDE_TYPE +{ + D3D_INCLUDE_LOCAL = 0, + D3D_INCLUDE_SYSTEM, + D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL, + D3D10_INCLUDE_SYSTEM = D3D_INCLUDE_SYSTEM, + D3D_INCLUDE_FORCE_DWORD = 0x7fffffff +} D3D_INCLUDE_TYPE; + +[ + object, + local, +] +interface ID3DInclude +{ + HRESULT Open(D3D_INCLUDE_TYPE include_type, + const char *filename, + const void *parent_data, + const void **data, + UINT *bytes); + HRESULT Close(const void *data); +} + +typedef ID3DInclude* LPD3DINCLUDE;

1 0

Alexandre Julliard : makefiles: Add dependencies for cross-compiled objects in static libraries.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 3bc110d91672d726657c58e038d01fd66c4dc6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bc110d91672d726657c58e03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 19:51:38 2010 +0200 makefiles: Add dependencies for cross-compiled objects in static libraries. --- dlls/Makeimplib.rules.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/Makeimplib.rules.in b/dlls/Makeimplib.rules.in index 1f9287d..a02cb4d 100644 --- a/dlls/Makeimplib.rules.in +++ b/dlls/Makeimplib.rules.in @@ -9,6 +9,7 @@ DLLFLAGS = @DLLFLAGS@ DEFS = -D__WINESRC__ $(EXTRADEFS) INSTALLDIRS = $(DESTDIR)$(dlldir) +MAKEDEPFLAGS = -xo -xcross.o @MAKE_RULES@

1 0

Vincent Povirk : gdiplus: Stub GdipMultiplyPathGradientTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 00aeee6e8eab57538c20fa74c65b494d654eb291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00aeee6e8eab57538c20fa74c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:17:06 2010 -0500 gdiplus: Stub GdipMultiplyPathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 529b9a2..3063a64 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1601,6 +1601,19 @@ GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, + GDIPCONST GpMatrix *matrix, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%p,%i)\n", grad, matrix, order); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetSolidFillColor(GpSolidFill *sf, ARGB argb) { TRACE("(%p, %x)\n", sf, argb); diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0e64185..5cb755c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -444,7 +444,7 @@ @ stdcall GdipMeasureString(ptr wstr long ptr ptr ptr ptr ptr ptr) @ stdcall GdipMultiplyLineTransform(ptr ptr long) @ stdcall GdipMultiplyMatrix(ptr ptr long) -@ stub GdipMultiplyPathGradientTransform +@ stdcall GdipMultiplyPathGradientTransform(ptr ptr long) @ stdcall GdipMultiplyPenTransform(ptr ptr long) @ stdcall GdipMultiplyTextureTransform(ptr ptr long) @ stdcall GdipMultiplyWorldTransform(ptr ptr long)

1 0

Vincent Povirk : gdiplus: Stub GdipGetPathGradientPresetBlendCount.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 358d382782a7ab871e2136b93ef7dae78a5add91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=358d382782a7ab871e2136b93… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:12:19 2010 -0500 gdiplus: Stub GdipGetPathGradientPresetBlendCount. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0abf623..529b9a2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1474,6 +1474,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPathGradientPresetBlendCount(GpPathGradient *brush, + INT *count) +{ + FIXME("(%p,%p): stub\n", brush, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 495bc14..0e64185 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -335,7 +335,7 @@ @ stub GdipGetPathGradientPath @ stdcall GdipGetPathGradientPointCount(ptr ptr) @ stub GdipGetPathGradientPresetBlend -@ stub GdipGetPathGradientPresetBlendCount +@ stdcall GdipGetPathGradientPresetBlendCount(ptr ptr) @ stdcall GdipGetPathGradientRect(ptr ptr) @ stdcall GdipGetPathGradientRectI(ptr ptr) @ stdcall GdipGetPathGradientSurroundColorCount(ptr ptr)

1 0

Vincent Povirk : gdiplus: Stub GdipGetPenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 2da2c9fd6b3628216444a6f2deaf748370877dd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2c9fd6b3628216444a6f2d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 18:00:49 2010 -0500 gdiplus: Stub GdipGetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4b9444e..495bc14 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -365,7 +365,7 @@ @ stdcall GdipGetPenMiterLimit(ptr ptr) @ stdcall GdipGetPenMode(ptr ptr) @ stdcall GdipGetPenStartCap(ptr ptr) -@ stub GdipGetPenTransform +@ stdcall GdipGetPenTransform(ptr ptr) @ stdcall GdipGetPenUnit(ptr ptr) @ stdcall GdipGetPenWidth(ptr ptr) @ stdcall GdipGetPixelOffsetMode(ptr ptr) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index c2b3399..4fed4d2 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -419,6 +419,21 @@ GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *pen, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

Vincent Povirk : gdiplus: Stub GdipRotatePenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: c1582f957ae0b358c5d9b2364883532a5f3a6000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1582f957ae0b358c5d9b2364… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:58:54 2010 -0500 gdiplus: Stub GdipRotatePenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 13bcc36..4b9444e 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -488,7 +488,7 @@ @ stdcall GdipRotateLineTransform(ptr long long) @ stdcall GdipRotateMatrix(ptr long long) @ stub GdipRotatePathGradientTransform -@ stub GdipRotatePenTransform +@ stdcall GdipRotatePenTransform(ptr long long) @ stdcall GdipRotateTextureTransform(ptr long long) @ stdcall GdipRotateWorldTransform(ptr long long) @ stub GdipSaveAdd diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 238eef1..c2b3399 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -434,6 +434,21 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix return NotImplemented; } +GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) +{ + static int calls; + + TRACE("(%p,%0.2f,%u)\n", pen, angle, order); + + if(!pen) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) {

1 0

Vincent Povirk : gdiplus: Stub GdipSetPenTransform.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 09de12b2a382f492b9d9a365da6fbada0cc4a04a URL: http://source.winehq.org/git/wine.git/?a=commit;h=09de12b2a382f492b9d9a365d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jun 19 17:56:42 2010 -0500 gdiplus: Stub GdipSetPenTransform. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/pen.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3201d32..13bcc36 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -577,7 +577,7 @@ @ stdcall GdipSetPenMiterLimit(ptr long) @ stdcall GdipSetPenMode(ptr long) @ stdcall GdipSetPenStartCap(ptr long) -@ stub GdipSetPenTransform +@ stdcall GdipSetPenTransform(ptr ptr) @ stub GdipSetPenUnit @ stdcall GdipSetPenWidth(ptr long) @ stdcall GdipSetPixelOffsetMode(ptr long) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index 53e47f0..238eef1 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -404,6 +404,21 @@ GpStatus WINGDIPAPI GdipResetPenTransform(GpPen *pen) return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPenTransform(GpPen *pen, GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", pen, matrix); + + if(!pen || !matrix) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrixOrder order) { static int calls;

1 0

Aric Stewart : usp10: Add beginning support for GSUB Alternate Substitution Subtable.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: d4befda3c7c3a7664e7093db534f282356034ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4befda3c7c3a7664e7093db5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 3 11:16:49 2010 -0500 usp10: Add beginning support for GSUB Alternate Substitution Subtable. --- dlls/usp10/shape.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0018ae5..210022d 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -219,6 +219,18 @@ typedef struct{ GSUB_SubstLookupRecord SubstLookupRecord[1]; }GSUB_ChainContextSubstFormat3_4; +typedef struct { + WORD SubstFormat; /* = 1 */ + WORD Coverage; + WORD AlternateSetCount; + WORD AlternateSet[1]; +} GSUB_AlternateSubstFormat1; + +typedef struct{ + WORD GlyphCount; + WORD Alternate[1]; +} GSUB_AlternateSet; + static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); /* the orders of joined_forms and contextual_features need to line up */ @@ -400,6 +412,38 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN return GSUB_E_NOGLYPH; } +static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Alternate Substitution Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GSUB_AlternateSubstFormat1 *asf1; + INT index; + + offset = GET_BE_WORD(look->SubTable[j]); + asf1 = (const GSUB_AlternateSubstFormat1*)((const BYTE*)look+offset); + offset = GET_BE_WORD(asf1->Coverage); + + index = GSUB_is_glyph_covered((const BYTE*)asf1+offset, glyphs[glyph_index]); + if (index != -1) + { + const GSUB_AlternateSet *as; + offset = GET_BE_WORD(asf1->AlternateSet[index]); + as = (const GSUB_AlternateSet*)((const BYTE*)asf1+offset); + FIXME("%i alternates, picking index 0\n",GET_BE_WORD(as->GlyphCount)); + + TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); + glyphs[glyph_index] = GET_BE_WORD(as->Alternate[0]); + TRACE(" 0x%x\n",glyphs[glyph_index]); + return glyph_index + 1; + } + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -572,6 +616,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 3: + return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 6:

1 0

Alexandre Julliard : shdocvw: Fix an incorrect const typecast.
by Alexandre Julliard 03 Aug '10

03 Aug '10

Module: wine Branch: master Commit: 76dd207733b6ea220da8705dc6312f3179443eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76dd207733b6ea220da8705dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 3 19:23:55 2010 +0200 shdocvw: Fix an incorrect const typecast. --- dlls/shdocvw/iexplore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index ea3fdf4..c8b93af 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -83,7 +83,7 @@ static HMENU get_fav_menu(HMENU menu) return GetSubMenu(menu, 1); } -static LPCWSTR get_fav_url_from_id(HMENU menu, UINT id) +static LPWSTR get_fav_url_from_id(HMENU menu, UINT id) { MENUITEMINFOW item; @@ -98,11 +98,11 @@ static LPCWSTR get_fav_url_from_id(HMENU menu, UINT id) static void free_fav_menu_data(HMENU menu) { - LPCWSTR url; + LPWSTR url; int i; for(i = 0; (url = get_fav_url_from_id(menu, ID_BROWSE_GOTOFAV_FIRST + i)); i++) - heap_free((LPWSTR)url); + heap_free( url ); } static int get_menu_item_count(HMENU menu)

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010