winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
1085 discussions
Start a n
N
ew thread
Evan Stade : gdiplus: Change include list on 3 tests.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: 44412cf1e43bdc212179242ea645129260ed7149 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=44412cf1e43bdc212179242ea…
Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:16 2007 -0700 gdiplus: Change include list on 3 tests. --- dlls/gdiplus/tests/brush.c | 4 +--- dlls/gdiplus/tests/matrix.c | 3 +-- dlls/gdiplus/tests/pen.c | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 7c72f48..70eac03 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -18,9 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" +#include "windows.h" #include "gdiplus.h" #include "wine/test.h" diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c index ff8a47f..cc53488 100644 --- a/dlls/gdiplus/tests/matrix.c +++ b/dlls/gdiplus/tests/matrix.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <math.h> -#include "windef.h" +#include "windows.h" #include "gdiplus.h" #include "wine/test.h" diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index fc792a6..00ecbfb 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -18,10 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> #include <math.h> -#include "windef.h" +#include "windows.h" #include "gdiplus.h" #include "wine/test.h"
1
0
0
0
Evan Stade : gdiplus: Fix memory leak in GdipCreateMetafileFromWMF.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: cfef981a9aeedc7dab3e626aa0aad6b48dcd87b9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=cfef981a9aeedc7dab3e626aa…
Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:12 2007 -0700 gdiplus: Fix memory leak in GdipCreateMetafileFromWMF. --- dlls/gdiplus/graphics.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 80684ff..52d6c5f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -846,11 +846,12 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { static int calls; - IStream *stream; + IStream *stream = NULL; UINT read; BYTE* copy; METAFILEPICT mfp; HENHMETAFILE hemf; + GpStatus retval = GenericError; if(!hwmf || !metafile || !placeable) return InvalidParameter; @@ -882,16 +883,19 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ ERR("could not make stream\n"); - return GenericError; + goto end; } *metafile = GdipAlloc(sizeof(GpMetafile)); - if(!*metafile) return OutOfMemory; + if(!*metafile){ + retval = OutOfMemory; + goto end; + } if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, (LPVOID*) &((*metafile)->image.picture)) != S_OK){ GdipFree(*metafile); - return GenericError; + goto end; } (*metafile)->image.type = ImageTypeMetafile; @@ -903,11 +907,15 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, - placeable->BoundingBox.Top)) / ((REAL) placeable->Inch); (*metafile)->unit = UnitInch; - if(delete) DeleteMetaFile(hwmf); - return Ok; + retval = Ok; + +end: + IStream_Release(stream); + GdipFree(copy); + return retval; } GpStatus WINGDIPAPI GdipDeleteGraphics(GpGraphics *graphics)
1
0
0
0
Evan Stade : gdiplus: Changed GdipGetImageType.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Evan Stade : gdiplus: Added more stubs to gdiplus.spec.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Evan Stade : gdiplus: Implemented GdipDisposeImage.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Evan Stade : gdiplus: Implemented GdipDisposeImageAttributes.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Juan Lang : crypt32: Remove bad special case, it isn' t necessary since the outer content specifies the hash algorithm.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Juan Lang : crypt32: Use the outer content' s signature algorithm rather than the public key's embedded algorithm.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Jacek Caban : shdocvw: Added GetExternal implementation.
by Alexandre Julliard
01 Aug '07
01 Aug '07
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
0
0
Jacek Caban : mshtml: Added IHTMLWindow::get_external implementation.
by Alexandre Julliard
01 Aug '07
01 Aug '07
Module: wine Branch: master Commit: a84520169f95a9084dec7caea86a929573d819ec URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a84520169f95a9084dec7caea…
Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 00:59:48 2007 +0200 mshtml: Added IHTMLWindow::get_external implementation. --- dlls/mshtml/htmlwindow.c | 11 +++++++++-- dlls/mshtml/tests/htmldoc.c | 38 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 83adbdc..1acb6db 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -662,8 +662,15 @@ static HRESULT WINAPI HTMLWindow2_resizeBy(IHTMLWindow2 *iface, long x, long y) static HRESULT WINAPI HTMLWindow2_get_external(IHTMLWindow2 *iface, IDispatch **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + + if(!This->doc->hostui) + return S_OK; + + return IDocHostUIHandler_GetExternal(This->doc->hostui, p); } #undef HTMLWINDOW2_THIS diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 2b32955..4379cdc 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -127,6 +127,7 @@ DEFINE_EXPECT(OnFocus_FALSE); DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(InPlaceFrame_SetBorderSpace); DEFINE_EXPECT(InPlaceUIWindow_SetActiveObject); +DEFINE_EXPECT(GetExternal); static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; @@ -1861,8 +1862,9 @@ static HRESULT WINAPI DocHostUIHandler_GetDropTarget(IDocHostUIHandler2 *iface, static HRESULT WINAPI DocHostUIHandler_GetExternal(IDocHostUIHandler2 *iface, IDispatch **ppDispatch) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT(GetExternal); + *ppDispatch = (void*)1; + return S_FALSE; } static HRESULT WINAPI DocHostUIHandler_TranslateUrl(IDocHostUIHandler2 *iface, DWORD dwTranslate, @@ -3444,6 +3446,36 @@ static void test_Navigate(IUnknown *unk) IHlinkTarget_Release(hlink); } +static void test_external(IUnknown *unk, BOOL initialized) +{ + IDispatch *external; + IHTMLDocument2 *doc; + IHTMLWindow2 *htmlwin; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "QueryInterface(IID_IHTMLWindow2) failed: %08x\n", hres); + + hres = IHTMLDocument2_get_parentWindow(doc, &htmlwin); + IHTMLDocument2_Release(doc); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + if(initialized) + SET_EXPECT(GetExternal); + external = (void*)0xdeadbeef; + hres = IHTMLWindow2_get_external(htmlwin, &external); + if(initialized) { + ok(hres == S_FALSE, "get_external failed: %08x\n", hres); + CHECK_CALLED(GetExternal); + ok(external == (void*)1, "external != NULL\n"); + }else { + ok(hres == S_OK, "get_external failed: %08x\n", hres); + ok(external == NULL, "external != NULL\n"); + } + + IHTMLWindow2_Release(htmlwin); +} + static void test_StreamLoad(IUnknown *unk) { IPersistStreamInit *init; @@ -3528,6 +3560,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_QueryInterface(unk); test_IsDirty(unk, S_FALSE); test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); + test_external(unk, FALSE); test_ConnectionPointContainer(unk); test_GetCurMoniker(unk, NULL, NULL); test_Persist(unk); @@ -3550,6 +3583,7 @@ static void test_HTMLDocument(enum load_state_t ls) test_OleCommandTarget(unk); test_OnAmbientPropertyChange(unk); test_Window(unk, TRUE); + test_external(unk, TRUE); test_UIDeactivate(); test_OleCommandTarget(unk);
1
0
0
0
← Newer
1
...
103
104
105
106
107
108
109
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
Results per page:
10
25
50
100
200