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

Evan Stade : gdiplus: Added GdipFindFirstImageItem stub.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: 7a8866b347f0604d40ec7579921ac197f695120f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8866b347f0604d40ec75799… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 31 19:15:33 2007 -0700 gdiplus: Added GdipFindFirstImageItem stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index dc7633c..8dd2e2a 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -231,7 +231,7 @@ @ stub GdipFillRectangles @ stub GdipFillRectanglesI @ stub GdipFillRegion -@ stub GdipFindFirstImageItem +@ stdcall GdipFindFirstImageItem(ptr ptr) @ stub GdipFindNextImageItem @ stub GdipFlattenPath @ stub GdipFlush diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 46b3357..ba5a23e 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); +typedef void ImageItemData; + GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) { if(!image) @@ -42,6 +44,14 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) return Ok; } +GpStatus WINGDIPAPI GdipFindFirstImageItem(GpImage *image, ImageItemData* item) +{ + if(!image || !item) + return InvalidParameter; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipGetImageBounds(GpImage *image, GpRectF *srcRect, GpUnit *srcUnit) {

1 0

Evan Stade : gdiplus: Added GdipGetMatrixElements.
by Alexandre Julliard 01 Aug '07

01 Aug '07

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 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

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

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

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

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

Jacek Caban : uuid: Added IID_IProxyManager.
by Alexandre Julliard 01 Aug '07

01 Aug '07

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 : mshtml: Fixed QueryInterface failures on IE7.
by Alexandre Julliard 01 Aug '07

01 Aug '07

Module: wine Branch: master Commit: a1970df5505df1c45ab3d81f34169fcfb759b3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1970df5505df1c45ab3d81f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 1 00:59:12 2007 +0200 mshtml: Fixed QueryInterface failures on IE7. --- dlls/mshtml/tests/htmldoc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5306d84..2b32955 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -2273,6 +2273,8 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) *ppv = &OleControlSite; else if(IsEqualGUID(&IID_IDocHostShowUI, riid)) return E_NOINTERFACE; /* TODO */ + else if(IsEqualGUID(&IID_IProxyManager, riid)) + return E_NOINTERFACE; /* ? */ else if(IsEqualGUID(&IID_unk1, riid)) return E_NOINTERFACE; /* HTMLWindow2 ? */ else if(IsEqualGUID(&IID_unk2, riid))

1 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