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

Evan Stade : gdiplus: Added GdipGetMetafileHeaderFromMetafile stub.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: e91d12454a6e709e9e5ded4369ae69f9c3db7455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e91d12454a6e709e9e5ded436… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:29 2007 -0700 gdiplus: Added GdipGetMetafileHeaderFromMetafile stub. --- dlls/gdiplus/customlinecap.c | 1 + dlls/gdiplus/gdiplus.c | 2 + dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 14 +++++ dlls/gdiplus/imageattributes.c | 1 + dlls/gdiplus/pathiterator.c | 1 + include/gdiplusenums.h | 11 ++++ include/gdiplusflat.h | 1 + include/gdiplusmetaheader.h | 123 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 155 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index aadea5f..eb851c9 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "gdiplus.h" #include "gdiplus_private.h" diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c index 80a4b9c..041d6fe 100644 --- a/dlls/gdiplus/gdiplus.c +++ b/dlls/gdiplus/gdiplus.c @@ -23,6 +23,8 @@ #include "winbase.h" #include "winerror.h" #include "wine/debug.h" +#include "wingdi.h" + #include "gdiplus.h" #include "gdiplus_private.h" diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8502e4c..dc7633c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -317,7 +317,7 @@ @ stub GdipGetMetafileDownLevelRasterizationLimit @ stub GdipGetMetafileHeaderFromEmf @ stub GdipGetMetafileHeaderFromFile -@ stub GdipGetMetafileHeaderFromMetafile +@ stdcall GdipGetMetafileHeaderFromMetafile(ptr ptr) @ stub GdipGetMetafileHeaderFromStream @ stub GdipGetMetafileHeaderFromWmf @ stub GdipGetNearestColor diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c378981..46b3357 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -134,6 +134,20 @@ GpStatus WINGDIPAPI GdipGetImageWidth(GpImage *image, UINT *width) return NotImplemented; } +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile * metafile, + MetafileHeader * header) +{ + static int calls; + + if(!metafile || !header) + return InvalidParameter; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage *image, GDIPCONST GUID* dimensionID, UINT* count) { diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index b378143..7c36780 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -17,6 +17,7 @@ */ #include "windef.h" +#include "wingdi.h" #include "gdiplus.h" #include "gdiplus_private.h" diff --git a/dlls/gdiplus/pathiterator.c b/dlls/gdiplus/pathiterator.c index a9e1d3f..b978c26 100644 --- a/dlls/gdiplus/pathiterator.c +++ b/dlls/gdiplus/pathiterator.c @@ -20,6 +20,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "gdiplus.h" #include "gdiplus_private.h" diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index 2d3c229..9d81051 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -173,6 +173,16 @@ enum WrapMode WrapModeClamp }; +enum MetafileType +{ + MetafileTypeInvalid, + MetafileTypeWmf, + MetafileTypeWmfPlaceable, + MetafileTypeEmf, + MetafileTypeEmfPlusOnly, + MetafileTypeEmfPlusDual +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -191,6 +201,7 @@ typedef enum DashStyle DashStyle; typedef enum MatrixOrder MatrixOrder; typedef enum ImageType ImageType; typedef enum WrapMode WrapMode; +typedef enum MetafileType MetafileType; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e4c5ba0..31b17f5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -142,6 +142,7 @@ GpStatus WINGDIPAPI GdipGetImageRawFormat(GpImage*,GUID*); GpStatus WINGDIPAPI GdipGetImageType(GpImage*,ImageType*); GpStatus WINGDIPAPI GdipGetImageVerticalResolution(GpImage*,REAL*); GpStatus WINGDIPAPI GdipGetImageWidth(GpImage*,UINT*); +GpStatus WINGDIPAPI GdipGetMetafileHeaderFromMetafile(GpMetafile*,MetafileHeader*); GpStatus WINGDIPAPI GdipImageGetFrameCount(GpImage*,GDIPCONST GUID*,UINT*); GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes**); diff --git a/include/gdiplusmetaheader.h b/include/gdiplusmetaheader.h index 2b4adf6..e59ab09 100644 --- a/include/gdiplusmetaheader.h +++ b/include/gdiplusmetaheader.h @@ -19,6 +19,25 @@ #ifndef _GDIPLUSMETAHEADER_H #define _GDIPLUSMETAHEADER_H +typedef struct +{ + DWORD iType; + DWORD nSize; + RECTL rclBounds; + RECTL rclFrame; + DWORD dSignature; + DWORD nVersion; + DWORD nBytes; + DWORD nRecords; + WORD nHandles; + WORD sReserved; + DWORD nDescription; + DWORD offDescription; + DWORD nPalEntries; + SIZEL szlDevice; + SIZEL szlMillimeters; +} ENHMETAHEADER3; + #include <pshpack2.h> typedef struct @@ -41,4 +60,108 @@ typedef struct #include <poppack.h> +#define GDIP_EMFPLUSFLAGS_DISPLAY 0x00000001 + +#ifdef __cplusplus +class MetafileHeader +{ +public: + MetafileType Type; + UINT Size; + UINT Version; + UINT EmfPlusFlags; + REAL DpiX; + REAL DpiY; + INT X; + INT Y; + INT Width; + INT Height; + union + { + METAHEADER WmfHeader; + ENHMETAHEADER3 EmfHeader; + }; + INT EmfPlusHeaderSize; + INT LogicalDpiX; + INT LogicalDpiY; + +public: + MetafileType GetType() const { return Type; } + + UINT GetMetafileSize() const { return Size; } + + UINT GetVersion() const { return Version; } + + UINT GetEmfPlusFlags() const { return EmfPlusFlags; } + + REAL GetDpiX() const { return DpiX; } + + REAL GetDpiY() const { return DpiY; } + + VOID GetBounds (OUT Rect *r) const + { + r->X = X; + r->Y = Y; + r->Width = Width; + r->Height = Height; + } + + BOOL IsWmf() const + { + return ((Type == MetafileTypeWmf) || (Type == MetafileTypeWmfPlaceable)); + } + + BOOL IsWmfPlaceable() const { return (Type == MetafileTypeWmfPlaceable); } + + BOOL IsEmf() const { return (Type == MetafileTypeEmf); } + + BOOL IsEmfOrEmfPlus() const { return (Type >= MetafileTypeEmf); } + + BOOL IsEmfPlus() const { return (Type >= MetafileTypeEmfPlusOnly); } + + BOOL IsEmfPlusDual() const { return (Type == MetafileTypeEmfPlusDual); } + + BOOL IsEmfPlusOnly() const { return (Type == MetafileTypeEmfPlusOnly); } + + BOOL IsDisplay() const + { + return IsEmfPlus() && ((EmfPlusFlags & GDIP_EMFPLUSFLAGS_DISPLAY) != 0); + } + + const METAHEADER * GetWmfHeader() const + { + return IsWmf() ? &WmfHeader : NULL; + } + + const ENHMETAHEADER3 * GetEmfHeader() const + { + return IsEmfOrEmfPlus() ? &EmfHeader : NULL; + } +}; +#else /* end of c++ typedefs */ + +typedef struct MetafileHeader +{ + MetafileType Type; + UINT Size; + UINT Version; + UINT EmfPlusFlags; + REAL DpiX; + REAL DpiY; + INT X; + INT Y; + INT Width; + INT Height; + union + { + METAHEADER WmfHeader; + ENHMETAHEADER3 EmfHeader; + } DUMMYUNIONNAME; + INT EmfPlusHeaderSize; + INT LogicalDpiX; + INT LogicalDpiY; +} MetafileHeader; + +#endif /* end of c typedefs */ + #endif /* _GDIPLUSMETAHEADER_H */

1 0

Evan Stade : gdiplus: Added GdipGetMatrixElements.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: dd5e9a91f364d02869b00a355227373242d813e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd5e9a91f364d02869b00a355… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:37 2007 -0700 gdiplus: Added GdipGetMatrixElements. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 11 +++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 8dd2e2a..95a3618 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -313,7 +313,7 @@ @ stub GdipGetLineWrapMode @ stub GdipGetLogFontA @ stub GdipGetLogFontW -@ stub GdipGetMatrixElements +@ stdcall GdipGetMatrixElements(ptr ptr) @ stub GdipGetMetafileDownLevelRasterizationLimit @ stub GdipGetMetafileHeaderFromEmf @ stub GdipGetMetafileHeaderFromFile diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 50d511a..afb2efe 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -111,6 +111,17 @@ GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) return Ok; } +GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix *matrix, + REAL *out) +{ + if(!matrix || !out) + return InvalidParameter; + + memcpy(out, matrix->matrix, sizeof(matrix->matrix)); + + return Ok; +} + GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GpMatrix* matrix2, GpMatrixOrder order) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 31b17f5..b618dad 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -116,6 +116,7 @@ GpStatus WINGDIPAPI GdipCloneMatrix(GpMatrix*,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipCreateMatrix(GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); +GpStatus WINGDIPAPI GdipGetMatrixElements(GDIPCONST GpMatrix*,REAL*); GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix*,GpMatrix*,GpMatrixOrder); GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix*,REAL,REAL,GpMatrixOrder);

1 0

Juan Lang : crypt32: Remove bad special case, it isn' t necessary since the outer content specifies the hash algorithm.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: db513c0cb57c1c6e6760562eabf43c69ab750ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db513c0cb57c1c6e6760562ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 31 14:59:04 2007 -0700 crypt32: Remove bad special case, it isn't necessary since the outer content specifies the hash algorithm. --- dlls/crypt32/cert.c | 31 +++++-------------------------- 1 files changed, 5 insertions(+), 26 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index de1d5e0..940778d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1353,37 +1353,16 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv, info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, signedCert->SignatureAlgorithm.pszObjId, 0); - if (!info || (info->dwGroupId != CRYPT_PUBKEY_ALG_OID_GROUP_ID && - info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID)) + if (!info || info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID) { SetLastError(NTE_BAD_ALGID); return FALSE; } - if (info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID) - { - switch (info->u.Algid) - { - case CALG_RSA_KEYX: - pubKeyID = CALG_RSA_SIGN; - hashID = CALG_SHA1; - break; - case CALG_RSA_SIGN: - pubKeyID = CALG_RSA_SIGN; - hashID = CALG_SHA1; - break; - default: - FIXME("unimplemented for %s\n", pubKeyInfo->Algorithm.pszObjId); - return FALSE; - } - } + hashID = info->u.Algid; + if (info->ExtraInfo.cbData >= sizeof(ALG_ID)) + pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData; else - { - hashID = info->u.Algid; - if (info->ExtraInfo.cbData >= sizeof(ALG_ID)) - pubKeyID = *(ALG_ID *)info->ExtraInfo.pbData; - else - pubKeyID = hashID; - } + pubKeyID = hashID; /* Load the default provider if necessary */ if (!hCryptProv) hCryptProv = CRYPT_GetDefaultProvider();

1 0

Evan Stade : gdiplus: Implemented GdipDisposeImage.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: 7352cfdb83d72457d0532474215406f67c7538a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7352cfdb83d72457d05324742… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:14:57 2007 -0700 gdiplus: Implemented GdipDisposeImage. --- dlls/gdiplus/image.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9b6ed41..0e86c4e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -21,6 +21,8 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" + +#define COBJMACROS #include "objbase.h" #include "gdiplus.h" @@ -31,15 +33,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { - static int calls; - - if(!image) - return InvalidParameter; + if(!image) + return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + IPicture_Release(image->picture); + GdipFree(image); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect,

1 0

Evan Stade : gdiplus: Changed GdipGetImageType.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: 9da6cc907e0bc7e6a09560b9bf6485d61381d5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9da6cc907e0bc7e6a09560b9b… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:08 2007 -0700 gdiplus: Changed GdipGetImageType. --- dlls/gdiplus/image.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 0e86c4e..c378981 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -103,8 +103,7 @@ GpStatus WINGDIPAPI GdipGetImageType(GpImage *image, ImageType *type) if(!image || !type) return InvalidParameter; - /* FIXME: get correct image type. */ - *type = ImageTypeUnknown; + *type = image->type; return Ok; }

1 0

Evan Stade : gdiplus: Implemented GdipDisposeImageAttributes.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: 8d05cb0c4730e0732d574fd8a30c248f0dc0bad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d05cb0c4730e0732d574fd8a… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:14:52 2007 -0700 gdiplus: Implemented GdipDisposeImageAttributes. --- dlls/gdiplus/imageattributes.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/imageattributes.c b/dlls/gdiplus/imageattributes.c index e441b0e..b378143 100644 --- a/dlls/gdiplus/imageattributes.c +++ b/dlls/gdiplus/imageattributes.c @@ -37,15 +37,12 @@ GpStatus WINGDIPAPI GdipCreateImageAttributes(GpImageAttributes **imageattr) GpStatus WINGDIPAPI GdipDisposeImageAttributes(GpImageAttributes *imageattr) { - static int calls; - if(!imageattr) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + GdipFree(imageattr); - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetImageAttributesWrapMode(GpImageAttributes *imageAttr,

1 0

Evan Stade : gdiplus: Added more stubs to gdiplus.spec.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: 359a21d62bb7bd77c1f84962000ec0fa6930f370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a21d62bb7bd77c1f849620… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:01 2007 -0700 gdiplus: Added more stubs to gdiplus.spec. --- dlls/gdiplus/gdiplus.spec | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d015c35..8502e4c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -35,6 +35,11 @@ @ stub GdipBeginContainer2 @ stub GdipBeginContainer @ stub GdipBeginContainerI +@ stub GdipBitmapApplyEffect +@ stub GdipBitmapConvertFormat +@ stub GdipBitmapCreateApplyEffect +@ stub GdipBitmapGetHistogram +@ stub GdipBitmapGetHistogramSize @ stub GdipBitmapGetPixel @ stub GdipBitmapLockBits @ stub GdipBitmapSetPixel @@ -61,6 +66,9 @@ @ stub GdipCombineRegionRectI @ stub GdipCombineRegionRegion @ stub GdipComment +@ stub GdipConvertToEmfPlus +@ stub GdipConvertToEmfPlusToFile +@ stub GdipConvertToEmfPlusToStream @ stub GdipCreateAdjustableArrowCap @ stub GdipCreateBitmapFromDirectDrawSurface @ stub GdipCreateBitmapFromFile @@ -75,6 +83,7 @@ @ stub GdipCreateBitmapFromStreamICM @ stub GdipCreateCachedBitmap @ stdcall GdipCreateCustomLineCap(ptr ptr long long ptr) +@ stub GdipCreateEffect @ stub GdipCreateFont @ stub GdipCreateFontFamilyFromName @ stub GdipCreateFontFromDC @@ -130,6 +139,7 @@ @ stdcall GdipDeleteBrush(ptr) @ stub GdipDeleteCachedBitmap @ stdcall GdipDeleteCustomLineCap(ptr) +@ stub GdipDeleteEffect @ stub GdipDeleteFont @ stub GdipDeleteFontFamily @ stdcall GdipDeleteGraphics(ptr) @@ -163,6 +173,7 @@ @ stub GdipDrawEllipse @ stub GdipDrawEllipseI @ stub GdipDrawImage +@ stub GdipDrawImageFX @ stub GdipDrawImageI @ stub GdipDrawImagePointRect @ stub GdipDrawImagePointRectI @@ -220,6 +231,8 @@ @ stub GdipFillRectangles @ stub GdipFillRectanglesI @ stub GdipFillRegion +@ stub GdipFindFirstImageItem +@ stub GdipFindNextImageItem @ stub GdipFlattenPath @ stub GdipFlush @ stdcall GdipFree(ptr) @@ -245,6 +258,8 @@ @ stub GdipGetDC @ stub GdipGetDpiX @ stub GdipGetDpiY +@ stub GdipGetEffectParameterSize +@ stub GdipGetEffectParameters @ stub GdipGetEmHeight @ stub GdipGetEncoderParameterList @ stub GdipGetEncoderParameterListSize @@ -275,6 +290,7 @@ @ stub GdipGetImageGraphicsContext @ stdcall GdipGetImageHeight(ptr ptr) @ stdcall GdipGetImageHorizontalResolution(ptr ptr) +@ stub GdipGetImageItemData @ stub GdipGetImagePalette @ stub GdipGetImagePaletteSize @ stub GdipGetImagePixelFormat @@ -388,12 +404,15 @@ @ stub GdipGetVisibleClipBoundsI @ stdcall GdipGetWorldTransform(ptr ptr) @ stub GdipGraphicsClear +@ stub GdipGraphicsSetAbort @ stub GdipImageForceValidation @ stdcall GdipImageGetFrameCount(ptr ptr ptr) @ stub GdipImageGetFrameDimensionsCount @ stub GdipImageGetFrameDimensionsList @ stub GdipImageRotateFlip @ stub GdipImageSelectActiveFrame +@ stub GdipImageSetAbort +@ stub GdipInitializePalette @ stub GdipInvertMatrix @ stub GdipIsClipEmpty @ stub GdipIsEmptyRegion @@ -444,6 +463,7 @@ @ stub GdipPathIterNextSubpathPath @ stdcall GdipPathIterRewind(ptr) @ stub GdipPlayMetafileRecord +@ stub GdipPlayTSClientRecord @ stub GdipPrivateAddFontFile @ stub GdipPrivateAddMemoryFont @ stub GdipRecordMetafile @@ -499,6 +519,7 @@ @ stub GdipSetCustomLineCapStrokeCaps @ stub GdipSetCustomLineCapStrokeJoin @ stub GdipSetCustomLineCapWidthScale +@ stub GdipSetEffectParameters @ stub GdipSetEmpty @ stub GdipSetImageAttributesCachedBackground @ stub GdipSetImageAttributesColorKeys

1 0

Juan Lang : crypt32: Use the outer content' s signature algorithm rather than the public key's embedded algorithm.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: e25b81fd9c7679a2bf7bfa632992855655767915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e25b81fd9c7679a2bf7bfa632… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 31 14:58:26 2007 -0700 crypt32: Use the outer content's signature algorithm rather than the public key's embedded algorithm. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 94859ca..de1d5e0 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1352,7 +1352,7 @@ static BOOL CRYPT_VerifyCertSignatureFromPublicKeyInfo(HCRYPTPROV hCryptProv, ALG_ID pubKeyID, hashID; info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, - pubKeyInfo->Algorithm.pszObjId, 0); + signedCert->SignatureAlgorithm.pszObjId, 0); if (!info || (info->dwGroupId != CRYPT_PUBKEY_ALG_OID_GROUP_ID && info->dwGroupId != CRYPT_SIGN_ALG_OID_GROUP_ID)) {

1 0

Jacek Caban : uuid: Added IID_IProxyManager.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: 8f2ac90a44927ac210a44b75a758339cc8f67d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2ac90a44927ac210a44b75a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 00:58:17 2007 +0200 uuid: Added IID_IProxyManager. --- dlls/uuid/uuid.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 4e9be90..d4943ef 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -76,9 +76,10 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "vfw.h" /* GUIDs not declared in an exported header file */ -DEFINE_GUID(IID_IDirectPlaySP,0xc9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); -DEFINE_GUID(IID_ISFHelper,0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); -DEFINE_GUID(IID_IDPLobbySP,0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); +DEFINE_GUID(IID_IDirectPlaySP, 0x0c9f6360,0xcc61,0x11cf,0xac,0xec,0x00,0xaa,0x00,0x68,0x86,0xe3); +DEFINE_GUID(IID_ISFHelper, 0x1fe68efb,0x1874,0x9812,0x56,0xdc,0x00,0x00,0x00,0x00,0x00,0x00); +DEFINE_GUID(IID_IDPLobbySP, 0x5a4e5a20,0x2ced,0x11d0,0xa8,0x89,0x00,0xa0,0xc9,0x05,0x43,0x3c); +DEFINE_GUID(IID_IProxyManager, 0x00000008,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(FMTID_SummaryInformation,0xF29F85E0,0x4FF9,0x1068,0xAB,0x91,0x08,0x00,0x2B,0x27,0xB3,0xD9); DEFINE_GUID(FMTID_DocSummaryInformation,0xD5CDD502,0x2E9C,0x101B,0x93,0x97,0x08,0x00,0x2B,0x2C,0xF9,0xAE);

1 0

Jacek Caban : shdocvw: Added GetExternal implementation.
by Alexandre Julliard Aug. 1, 2007

Aug. 1, 2007

Module: wine Branch: master Commit: e23c5083f52229cdd0a41b1c532a1f3e4ec641ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23c5083f52229cdd0a41b1c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 01:00:27 2007 +0200 shdocvw: Added GetExternal implementation. --- dlls/shdocvw/dochost.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index f26447d..1637cc3 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -406,7 +406,13 @@ static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { DocHost *This = DOCHOSTUI_THIS(iface); - FIXME("(%p)->(%p)\n", This, ppDispatch); + + TRACE("(%p)->(%p)\n", This, ppDispatch); + + if(This->hostui) + return IDocHostUIHandler_GetExternal(This->hostui, ppDispatch); + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0