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

Matteo Bruni : include: Stub d3dcompiler.h, d3d11shader.h.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

Module: wine Branch: master Commit: 2d14335f6f1aaf493c357a403c3352916ba9f484 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d14335f6f1aaf493c357a403… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue Aug 3 18:44:25 2010 +0200 include: Stub d3dcompiler.h, d3d11shader.h. --- include/Makefile.in | 2 ++ include/d3d11shader.h | 24 ++++++++++++++++++++++++ include/d3dcompiler.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 153272d..e6215e3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -156,6 +156,7 @@ SRCDIR_INCLUDES = \ d3d10effect.h \ d3d10misc.h \ d3d10shader.h \ + d3d11shader.h \ d3d8.h \ d3d8caps.h \ d3d8types.h \ @@ -163,6 +164,7 @@ SRCDIR_INCLUDES = \ d3d9caps.h \ d3d9types.h \ d3dcaps.h \ + d3dcompiler.h \ d3dhal.h \ d3drm.h \ d3drmdef.h \ diff --git a/include/d3d11shader.h b/include/d3d11shader.h new file mode 100644 index 0000000..2ccb51a --- /dev/null +++ b/include/d3d11shader.h @@ -0,0 +1,24 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * 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 __D3D11SHADER_H__ +#define __D3D11SHADER_H__ + +#include "d3dcommon.h" + +#endif diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h new file mode 100644 index 0000000..27ed290 --- /dev/null +++ b/include/d3dcompiler.h @@ -0,0 +1,44 @@ +/* + * Copyright 2010 Matteo Bruni for CodeWeavers + * + * 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 __D3DCOMPILER_H__ +#define __D3DCOMPILER_H__ + +#include "d3d11shader.h" + +#define D3DCOMPILE_DEBUG 0x0001 +#define D3DCOMPILE_SKIP_VALIDATION 0x0002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x0004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x0008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x0010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x0020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x0040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x0080 +#define D3DCOMPILE_NO_PRESHADER 0x0100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x0200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x0400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x0800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x1000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x2000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x4000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x0000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0xC000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x8000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x40000 + +#endif

1 0

Matteo Bruni : include: Add some d3dcompiler-related definitions.
by Alexandre Julliard Aug. 4, 2010

Aug. 4, 2010

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

Vincent Povirk : gdiplus: Stub GdipMultiplyPathGradientTransform.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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

Alexandre Julliard : makefiles: Add dependencies for cross-compiled objects in static libraries.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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 GdipGetPathGradientPresetBlendCount.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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 GdipSetPenTransform.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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

Alexander Nicolaysen Sørnes : shdocvw: Allow the addressbar text in IE to be localized.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: f74a563120165ca1f4de2656430c2a156bc38475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74a563120165ca1f4de26564… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 13:00:10 2010 +0200 shdocvw: Allow the addressbar text in IE to be localized. --- dlls/shdocvw/En.rc | 5 +++++ dlls/shdocvw/iexplore.c | 4 +++- dlls/shdocvw/resource.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index ee6e378..014245b 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -70,3 +70,8 @@ STRINGTABLE IDS_TB_HOME "Home" IDS_TB_PRINT "Print" } + +STRINGTABLE +{ + IDS_ADDRESS "Address" +} diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c4d545b..ea3fdf4 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -354,10 +354,12 @@ static void create_rebar(HWND hwnd) HWND hwndToolbar; REBARINFO rebarinf; REBARBANDINFOW bandinf; - WCHAR addr[] = {'A','d','d','r','e','s','s',0}; + WCHAR addr[40]; HIMAGELIST imagelist; WCHAR idb_ietoolbar[] = {'I','D','B','_','I','E','T','O','O','L','B','A','R',0}; + LoadStringW(shdocvw_hinstance, IDS_ADDRESS, addr, sizeof(addr)/sizeof(addr[0])); + hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, 0, 0, 0, 0, hwnd, (HMENU)IDC_BROWSE_REBAR, shdocvw_hinstance, NULL); rebarinf.cbSize = sizeof(rebarinf); diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 11b710d..c313ef7 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -52,3 +52,5 @@ #define IDS_TB_REFRESH 1103 #define IDS_TB_HOME 1104 #define IDS_TB_PRINT 1105 + +#define IDS_ADDRESS 1106

1 0

Aric Stewart : usp10: Add beginning support for GSUB Alternate Substitution Subtable.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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

Vincent Povirk : gdiplus: Stub GdipRotatePenTransform.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

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

Alexander Nicolaysen Sørnes : shdocvw: Add a toolbar to IE.
by Alexandre Julliard Aug. 3, 2010

Aug. 3, 2010

Module: wine Branch: master Commit: 5d7c46096222b2f1c78c450defb0558eb29559b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d7c46096222b2f1c78c450de… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Aug 3 12:36:30 2010 +0200 shdocvw: Add a toolbar to IE. --- dlls/shdocvw/En.rc | 10 ++++++++ dlls/shdocvw/iexplore.c | 58 +++++++++++++++++++++++++++++++++++++++++++--- dlls/shdocvw/resource.h | 8 ++++++ 3 files changed, 72 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/En.rc b/dlls/shdocvw/En.rc index 0c70851..ee6e378 100644 --- a/dlls/shdocvw/En.rc +++ b/dlls/shdocvw/En.rc @@ -60,3 +60,13 @@ IDR_BROWSE_MAIN_MENU MENU MENUITEM "&About Internet Explorer...", ID_BROWSE_ABOUT } } + +STRINGTABLE +{ + IDS_TB_BACK "Back" + IDS_TB_FORWARD "Forward" + IDS_TB_STOP "Stop" + IDS_TB_REFRESH "Refresh" + IDS_TB_HOME "Home" + IDS_TB_PRINT "Print" +} diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c index c934753..a908744 100644 --- a/dlls/shdocvw/iexplore.c +++ b/dlls/shdocvw/iexplore.c @@ -319,10 +319,39 @@ static void ie_dialog_about(HWND hwnd) DestroyIcon(icon); } +static void add_tb_separator(HWND hwnd) +{ + TBBUTTON btn; + + ZeroMemory(&btn, sizeof(btn)); + + btn.iBitmap = 3; + btn.fsStyle = BTNS_SEP; + SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); +} + +static void add_tb_button(HWND hwnd, int bmp, int cmd, int strId) +{ + TBBUTTON btn; + WCHAR buf[30]; + + LoadStringW(shdocvw_hinstance, strId, buf, sizeof(buf)/sizeof(buf[0])); + + btn.iBitmap = bmp; + btn.idCommand = cmd; + btn.fsState = TBSTATE_ENABLED; + btn.fsStyle = BTNS_SHOWTEXT; + btn.dwData = 0; + btn.iString = (INT_PTR)buf; + + SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); +} + static void create_rebar(HWND hwnd) { HWND hwndRebar; HWND hwndAddress; + HWND hwndToolbar; REBARINFO rebarinf; REBARBANDINFOW bandinf; WCHAR addr[] = {'A','d','d','r','e','s','s',0}; @@ -336,16 +365,37 @@ static void create_rebar(HWND hwnd) SendMessageW(hwndRebar, RB_SETBARINFO, 0, (LPARAM)&rebarinf); + hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, shdocvw_hinstance, NULL); + + SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_BACK); + add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_FORWARD); + add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_STOP); + add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_REFRESH); + add_tb_button(hwndToolbar, I_IMAGENONE, 0, IDS_TB_HOME); + add_tb_separator(hwndToolbar); + add_tb_button(hwndToolbar, I_IMAGENONE, ID_BROWSE_PRINT, IDS_TB_PRINT); + SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(50,40)); + SendMessageW(hwndToolbar, TB_AUTOSIZE, 0, 0); + + bandinf.cbSize = sizeof(bandinf); + bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE; + bandinf.fStyle = RBBS_CHILDEDGE; + bandinf.cx = 100; + bandinf.cyMinChild = 42; + bandinf.hwndChild = hwndToolbar; + + SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); + hwndAddress = CreateWindowExW(0, WC_COMBOBOXEXW, NULL, WS_BORDER|WS_CHILD|WS_VISIBLE|CBS_DROPDOWN, 0, 0, 100,20,hwndRebar, (HMENU)IDC_BROWSE_ADDRESSBAR, shdocvw_hinstance, NULL); - bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE | RBBIM_SIZE | RBBIM_TEXT; - bandinf.fStyle = RBBS_CHILDEDGE | RBBS_GRIPPERALWAYS; + bandinf.fMask |= RBBIM_TEXT; + bandinf.fStyle = RBBS_CHILDEDGE | RBBS_BREAK; bandinf.lpText = addr; - bandinf.cx = 100; bandinf.cyMinChild = 20; bandinf.hwndChild = hwndAddress; - SendMessageW(hwndRebar, RB_INSERTBANDW, 0, (LPARAM)&bandinf); + SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); } static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) diff --git a/dlls/shdocvw/resource.h b/dlls/shdocvw/resource.h index 898703c..3e497fe 100644 --- a/dlls/shdocvw/resource.h +++ b/dlls/shdocvw/resource.h @@ -27,6 +27,7 @@ #define IDC_BROWSE_REBAR 1003 #define IDC_BROWSE_ADDRESSBAR 1004 #define IDC_BROWSE_STATUSBAR 1005 +#define IDC_BROWSE_TOOLBAR 1006 #define ID_BROWSE_NEW_WINDOW 275 #define ID_BROWSE_OPEN 256 @@ -42,3 +43,10 @@ #define ID_BROWSE_GOTOFAV_FIRST 2000 #define ID_BROWSE_GOTOFAV_MAX 65000 + +#define IDS_TB_BACK 1100 +#define IDS_TB_FORWARD 1101 +#define IDS_TB_STOP 1102 +#define IDS_TB_REFRESH 1103 +#define IDS_TB_HOME 1104 +#define IDS_TB_PRINT 1105

1 0