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

Evan Stade : gdiplus: Implemented GdipGetImageType.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 55c77d46c6ab333daf3349132168dda52f88cfa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55c77d46c6ab333daf3349132… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:49 2007 -0700 gdiplus: Implemented GdipGetImageType. --- dlls/gdiplus/image.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index b9c0abb..849b1b4 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -97,15 +97,13 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage *image, GUID *format) GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) { - static int calls; - if(!image || !type) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + /* FIXME: get correct image type. */ + *type = ImageTypeUnknown; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage *image, REAL *res)

1 0

Evan Stade : gdiplus: Added GdipDrawImagePointsRect stub.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 460f01b3208dd0f6e1892d22d40a3105dd26ba86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=460f01b3208dd0f6e1892d22d… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:45 2007 -0700 gdiplus: Added GdipDrawImagePointsRect stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 16 ++++++++++++++++ include/gdiplusflat.h | 3 +++ include/gdiplustypes.h | 3 +++ 4 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a727ff3..d015c35 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -168,7 +168,7 @@ @ stub GdipDrawImagePointRectI @ stub GdipDrawImagePoints @ stub GdipDrawImagePointsI -@ stub GdipDrawImagePointsRect +@ stdcall GdipDrawImagePointsRect(ptr ptr ptr long long long long long long ptr ptr ptr) @ stub GdipDrawImagePointsRectI @ stub GdipDrawImageRect @ stub GdipDrawImageRectI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 24d61d3..2f582b2 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1016,6 +1016,22 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, return retval; } +GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, + GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, + REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, + DrawImageAbort callback, VOID * callbackData) +{ + static int calls; + + if(!graphics || !image || !points || !imageAttributes) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, INT y1, INT x2, INT y2) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7e2a84d..e4c5ba0 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -56,6 +56,9 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); +GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics*,GpImage*, + GDIPCONST GpPointF*,INT,REAL,REAL,REAL,REAL,GpUnit, + GDIPCONST GpImageAttributes*,DrawImageAbort,VOID*); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 426ab7a..c316073 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -21,6 +21,9 @@ typedef float REAL; +typedef BOOL (CALLBACK * ImageAbort)(VOID *); +typedef ImageAbort DrawImageAbort; + enum Status{ Ok = 0, GenericError = 1,

1 0

Evan Stade : gdiplus: Added ImageAttributes stubs.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 5dd58254843f9841da826076c27421deca8e8ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd58254843f9841da826076c… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:41 2007 -0700 gdiplus: Added ImageAttributes stubs. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 6 ++-- dlls/gdiplus/imageattributes.c | 65 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusenums.h | 10 ++++++ include/gdiplusflat.h | 5 +++ include/gdiplusgpstubs.h | 2 + 6 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index 8efc6d6..d651c4c 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ graphics.c \ graphicspath.c \ image.c \ + imageattributes.c \ matrix.c \ pathiterator.c \ pen.c diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b05054b..a727ff3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -88,7 +88,7 @@ @ stub GdipCreateHICONFromBitmap @ stub GdipCreateHalftonePalette @ stub GdipCreateHatchBrush -@ stub GdipCreateImageAttributes +@ stdcall GdipCreateImageAttributes(ptr) @ stub GdipCreateLineBrush @ stub GdipCreateLineBrushFromRect @ stub GdipCreateLineBrushFromRectI @@ -141,7 +141,7 @@ @ stub GdipDeleteRegion @ stub GdipDeleteStringFormat @ stdcall GdipDisposeImage(ptr) -@ stub GdipDisposeImageAttributes +@ stdcall GdipDisposeImageAttributes(ptr) @ stdcall GdipDrawArc(ptr ptr long long long long long long) @ stub GdipDrawArcI @ stdcall GdipDrawBezier(ptr ptr long long long long long long long long) @@ -510,7 +510,7 @@ @ stub GdipSetImageAttributesRemapTable @ stub GdipSetImageAttributesThreshold @ stub GdipSetImageAttributesToIdentity -@ stub GdipSetImageAttributesWrapMode +@ stdcall GdipSetImageAttributesWrapMode(ptr long long long) @ stub GdipSetImagePalette @ stub GdipSetInfinite @ stdcall GdipSetInterpolationMode(ptr long) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c new file mode 100644 index 0000000..81fd107 --- /dev/null +++ b/dlls/gdiplus/imageattributes.c @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * 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 + */ + +#include "windef.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); + +GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) +{ + static int calls; + + if(!imageattr) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) +{ + static int calls; + + if(!imageattr) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr, + WrapMode wrap, ARGB argb, BOOL clamp) +{ + static int calls; + + if(!imageAttr) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index ac9de4b..2d3c229 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -164,6 +164,15 @@ enum ImageType ImageTypeMetafile }; +enum WrapMode +{ + WrapModeTile, + WrapModeTileFlipX, + WrapModeTileFlipY, + WrapModeTileFlipXY, + WrapModeClamp +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -181,6 +190,7 @@ typedef enum DashCap DashCap; typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; +typedef enum WrapMode WrapMode; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index cd34bb6..7e2a84d 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -141,6 +141,11 @@ GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); +GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); +GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes*); +GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes*,WrapMode, + ARGB,BOOL); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 9d57648..30a04d2 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -31,6 +31,7 @@ class GpPathIterator {}; class GpCustomLineCap {}; class GpImage {}; class GpMetafile : public GpImage {}; +class GpImageAttributes {}; #else /* end of c++ declarations */ @@ -44,6 +45,7 @@ typedef struct GpPathIterator GpPathIterator; typedef struct GpCustomLineCap GpCustomLineCap; typedef struct GpImage GpImage; typedef struct GpMetafile GpMetafile; +typedef struct GpImageAttributes GpImageAttributes; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipGetImageBounds stub.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: a0b144a1e3b068a6f35c5c121950e8353950d84f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b144a1e3b068a6f35c5c121… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:37 2007 -0700 gdiplus: Added GdipGetImageBounds stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 ++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index cf08c90..b05054b 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -265,7 +265,7 @@ @ stub GdipGetHatchStyle @ stub GdipGetHemfFromMetafile @ stub GdipGetImageAttributesAdjustedPalette -@ stub GdipGetImageBounds +@ stdcall GdipGetImageBounds(ptr ptr ptr) @ stub GdipGetImageDecoders @ stub GdipGetImageDecodersSize @ stub GdipGetImageDimension diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f7c56a3..b9c0abb 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -42,6 +42,20 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, + GpUnit *srcUnit) +{ + static int calls; + + if(!image || !srcRect || !srcUnit) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetImageHeight(GpImage *image, UINT *height) { static int calls; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index eabdbfb..cd34bb6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -132,6 +132,7 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath*,GpPath*,GpLineCap,REAL, GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap*); GpStatus WINGDIPAPI GdipDisposeImage(GpImage*); +GpStatus WINGDIPAPI GdipGetImageBounds(GpImage*,GpRectF*,GpUnit*); GpStatus WINGDIPAPI GdipGetImageHeight(GpImage*,UINT*); GpStatus WINGDIPAPI GdipGetImageHorizontalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*);

1 0

Evan Stade : gdiplus: Partial implementation of GdipCreateMetafileFromWMF.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 50799cf04f1dcc634a6f9f07c39ea06b98f21e65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50799cf04f1dcc634a6f9f07c… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:10:03 2007 -0700 gdiplus: Partial implementation of GdipCreateMetafileFromWMF. --- dlls/gdiplus/Makefile.in | 3 +- dlls/gdiplus/gdiplus_private.h | 18 ++++++++++++ dlls/gdiplus/graphics.c | 57 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index dc4e2e0..8efc6d6 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -4,7 +4,8 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = gdiplus.dll IMPORTLIB = libgdiplus.$(IMPLIBEXT) -IMPORTS = user32 gdi32 advapi32 kernel32 ntdll +IMPORTS = oleaut32 ole32 user32 gdi32 advapi32 kernel32 ntdll +EXTRALIBS = -luuid C_SRCS = \ brush.c \ diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index b9420a3..8050125 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -20,13 +20,22 @@ #define __WINE_GP_PRIVATE_H_ #include <math.h> +#include <stdarg.h> + #include "windef.h" #include "wingdi.h" +#include "winbase.h" +#include "winuser.h" + +#include "objbase.h" +#include "ocidl.h" + #include "gdiplus.h" #define GP_DEFAULT_PENSTYLE (PS_GEOMETRIC | PS_SOLID | PS_ENDCAP_FLAT | PS_JOIN_MITER) #define MAX_ARC_PTS (13) #define MAX_DASHLEN (16) /* this is a limitation of gdi */ +#define INCH_HIMETRIC (2540) COLORREF ARGB2COLORREF(ARGB color); extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2, @@ -108,4 +117,13 @@ struct GpCustomLineCap{ REAL inset; /* how much to adjust the end of the line */ }; +struct GpImage{ + IPicture* picture; + ImageType type; +}; + +struct GpMetafile{ + GpImage image; +}; + #endif diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 92662b5..24d61d3 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -23,6 +23,13 @@ #include "winbase.h" #include "winuser.h" #include "wingdi.h" + +#define COBJMACROS +#include "objbase.h" +#include "ocidl.h" +#include "olectl.h" +#include "ole2.h" + #include "gdiplus.h" #include "gdiplus_private.h" #include "wine/debug.h" @@ -839,14 +846,60 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { static int calls; + IStream *stream; + UINT read; + BYTE* copy; + METAFILEPICT mfp; + HENHMETAFILE hemf; if(!hwmf || !metafile || !placeable) return InvalidParameter; if(!(calls++)) - FIXME("not implemented\n"); + FIXME("partially implemented\n"); - return NotImplemented; + if(placeable->Inch != INCH_HIMETRIC) + return NotImplemented; + + mfp.mm = MM_HIMETRIC; + mfp.xExt = placeable->BoundingBox.Right - placeable->BoundingBox.Left; + mfp.yExt = placeable->BoundingBox.Bottom - placeable->BoundingBox.Top; + mfp.hMF = NULL; + + read = GetMetaFileBitsEx(hwmf, 0, NULL); + if(!read) + return GenericError; + copy = GdipAlloc(read); + GetMetaFileBitsEx(hwmf, read, copy); + + hemf = SetWinMetaFileBits(read, copy, NULL, &mfp); + GdipFree(copy); + + read = GetEnhMetaFileBits(hemf, 0, NULL); + copy = GdipAlloc(read); + GetEnhMetaFileBits(hemf, read, copy); + DeleteEnhMetaFile(hemf); + + if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ + ERR("could not make stream\n"); + return GenericError; + } + + *metafile = GdipAlloc(sizeof(GpMetafile)); + if(!*metafile) return OutOfMemory; + + if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, + (LPVOID*) &((*metafile)->image.picture)) != S_OK){ + GdipFree(*metafile); + return GenericError; + } + + (*metafile)->image.type = ImageTypeMetafile; + + if(delete) + DeleteMetaFile(hwmf); + + return Ok; } GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics)

1 0

Evan Stade : oleaut32: Recognize EMF header when loading picture.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 249c07c16104c764481f6701349961998290f418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=249c07c16104c764481f67013… Author: Evan Stade <estade(a)gmail.com> Date: Mon Jul 30 19:09:33 2007 -0700 oleaut32: Recognize EMF header when loading picture. --- dlls/oleaut32/olepicture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 01e766d..e1c61b2 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1693,6 +1693,7 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { if (!memcmp(&(header[0]), "GIF8", 4) || /* GIF header */ !memcmp(&(header[0]), "BM", 2) || /* BMP header */ !memcmp(&(header[0]), "\xff\xd8", 2) || /* JPEG header */ + (header[0] == EMR_HEADER) || /* EMF header */ (header[1] > statstg.cbSize.QuadPart)|| /* invalid size */ (header[1]==0) ) {/* Found start of bitmap data */

1 0

Jacek Caban : mshtml: Added HTMLWindow's IDispatch methods implementation.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 4005cf72d6f79404a1df377ecb3379ea5bac5180 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4005cf72d6f79404a1df377ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 00:53:10 2007 +0200 mshtml: Added HTMLWindow's IDispatch methods implementation. --- dlls/mshtml/htmlwindow.c | 47 +++++++++++++++++++++++++++++++++--------- dlls/mshtml/main.c | 44 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 8 +++++++ 3 files changed, 88 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4375901..83adbdc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -98,16 +98,26 @@ static ULONG WINAPI HTMLWindow2_Release(IHTMLWindow2 *iface) static HRESULT WINAPI HTMLWindow2_GetTypeInfoCount(IHTMLWindow2 *iface, UINT *pctinfo) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI HTMLWindow2_GetTypeInfo(IHTMLWindow2 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(IHTMLWindow2_tid, ppTInfo); + if(SUCCEEDED(hres)) + ITypeInfo_AddRef(*ppTInfo); + + return hres; } static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid, @@ -115,9 +125,17 @@ static HRESULT WINAPI HTMLWindow2_GetIDsOfNames(IHTMLWindow2 *iface, REFIID riid LCID lcid, DISPID *rgDispId) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); + if(SUCCEEDED(hres)) + hres = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + + return hres; } static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMember, @@ -125,9 +143,18 @@ static HRESULT WINAPI HTMLWindow2_Invoke(IHTMLWindow2 *iface, DISPID dispIdMembe VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hres = get_typeinfo(IHTMLWindow2_tid, &typeinfo); + if(SUCCEEDED(hres)) + hres = ITypeInfo_Invoke(typeinfo, HTMLWINDOW2(This), dispIdMember, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); + + return hres; } static HRESULT WINAPI HTMLWindow2_item(IHTMLWindow2 *iface, VARIANT *pvarIndex, VARIANT *pvarResult) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index 3f8131c..41f32eb 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -51,10 +51,52 @@ DWORD mshtml_tls = 0; static HINSTANCE shdoclc = NULL; +static ITypeLib *typelib; +static ITypeInfo *typeinfos[LAST_tid]; + +static const REFIID tid_ids[] = { + &IID_IHTMLWindow2 +}; + +HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) +{ + HRESULT hres; + + if(!typelib) { + hres = LoadRegTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, &typelib); + if(FAILED(hres)) { + ERR("LoadRegTypeLib failed: %08x\n", hres); + return hres; + } + } + + if(!typeinfos[tid]) { + hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], typeinfos+tid); + if(FAILED(hres)) { + ERR("GetTypeInfoOfGuid failed: %08x\n", hres); + return hres; + } + } + + *typeinfo = typeinfos[tid]; + return S_OK; +} + static void thread_detach(void) { - thread_data_t *thread_data = get_thread_data(FALSE); + thread_data_t *thread_data; + + if(typelib) { + unsigned i; + + for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + if(typeinfos[i]) + ITypeInfo_Release(typeinfos[i]); + + ITypeLib_Release(typelib); + } + thread_data = get_thread_data(FALSE); if(!thread_data) return; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 27f9ba7..0bd36a7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -472,6 +472,14 @@ HWND get_thread_hwnd(void); void push_task(task_t*); void remove_doc_tasks(const HTMLDocument*); +/* typelibs */ +enum tid_t { + IHTMLWindow2_tid, + LAST_tid +}; + +HRESULT get_typeinfo(enum tid_t, ITypeInfo**); + DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B); DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82, 0x00,0xAA,0x00,0xBD,0xCE,0x0B);

1 0

Jacek Caban : mshtml: Added mshtml.tlb registration.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 7d1c59edcee16dbd81fb086fbc2739921f73ece2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d1c59edcee16dbd81fb086fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 31 00:51:59 2007 +0200 mshtml: Added mshtml.tlb registration. --- dlls/mshtml/main.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index fc224bc..3f8131c 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -376,6 +376,26 @@ static HRESULT register_server(BOOL do_register) for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) mshtml_free(pse[i].pszValue); + if(FAILED(hres)) { + ERR("RegInstall failed: %08x\n", hres); + return hres; + } + + if(do_register) { + ITypeLib *typelib; + + static const WCHAR wszMSHTML[] = {'m','s','h','t','m','l','.','t','l','b',0}; + + hres = LoadTypeLibEx(wszMSHTML, REGKIND_REGISTER, &typelib); + if(SUCCEEDED(hres)) + ITypeLib_Release(typelib); + }else { + hres = UnRegisterTypeLib(&LIBID_MSHTML, 4, 0, LOCALE_SYSTEM_DEFAULT, SYS_WIN32); + } + + if(FAILED(hres)) + ERR("typelib registration failed: %08x\n", hres); + return hres; }

1 0

Juan Lang : crypt32: Simplify alignment calculation.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: f0509c49d1701e9dd962962254226436e9b8ba19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0509c49d1701e9dd96296225… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:08:24 2007 -0700 crypt32: Simplify alignment calculation. --- dlls/crypt32/decode.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 2f589dc..846f6e1 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -351,19 +351,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, : NULL, &items[i].size); if (ret) { - if (nextData && items[i].hasPointer && - items[i].size > items[i].minSize) - { - nextData += items[i].size - items[i].minSize; - /* align nextData to DWORD boundaries */ - if (items[i].size % sizeof(DWORD)) - nextData += sizeof(DWORD) - items[i].size % - sizeof(DWORD); - } /* Account for alignment padding */ if (items[i].size % sizeof(DWORD)) items[i].size += sizeof(DWORD) - items[i].size % sizeof(DWORD); + if (nextData && items[i].hasPointer && + items[i].size > items[i].minSize) + nextData += items[i].size - items[i].minSize; ptr += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen; TRACE("item %d: decoded %d bytes\n", i,

1 0

Juan Lang : crypt32: Support getting the inner content OID from a decoded signed message.
by Alexandre Julliard July 31, 2007

July 31, 2007

Module: wine Branch: master Commit: 4e0f33dada3257373f012a779538bae1b1331b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e0f33dada3257373f012a779… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 30 12:10:27 2007 -0700 crypt32: Support getting the inner content OID from a decoded signed message. --- dlls/crypt32/msg.c | 8 ++++++++ dlls/crypt32/tests/msg.c | 1 - 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 54f0636..c0ddcae 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1760,6 +1760,14 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, else SetLastError(CRYPT_E_INVALID_MSG_TYPE); break; + case CMSG_INNER_CONTENT_TYPE_PARAM: + if (msg->u.signedInfo) + ret = CRYPT_CopyParam(pvData, pcbData, + msg->u.signedInfo->content.pszObjId, + strlen(msg->u.signedInfo->content.pszObjId) + 1); + else + SetLastError(CRYPT_E_INVALID_MSG_TYPE); + break; case CMSG_SIGNER_COUNT_PARAM: if (msg->u.signedInfo) ret = CRYPT_CopyParam(pvData, pcbData, diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index 28b11e5..dba0752 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -1978,7 +1978,6 @@ static void test_decode_msg_get_param(void) ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError()); check_param("signed content", msg, CMSG_CONTENT_PARAM, msgData, sizeof(msgData)); - todo_wine check_param("inner content", msg, CMSG_INNER_CONTENT_TYPE_PARAM, (const BYTE *)szOID_RSA_data, strlen(szOID_RSA_data) + 1); size = sizeof(value);

1 0