December 2014 - Wine-Commits

Frédéric Delanoy : French translation for release 1.7.33
by Jeremy Newman Dec. 13, 2014

Dec. 13, 2014

Module: website Branch: master Commit: af15fbf833a51e95781f07127c049e24a76a62aa URL: http://source.winehq.org/git/website.git/?a=commit;h=af15fbf833a51e95781f07… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Dec 12 21:44:46 2014 +0100 French translation for release 1.7.33 --- news/fr/2014121201.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/fr/2014121201.xml b/news/fr/2014121201.xml new file mode 100644 index 0000000..cfb7cd8 --- /dev/null +++ b/news/fr/2014121201.xml @@ -0,0 +1,15 @@ +<news> +<date>12 décembre 2014</date> +<title>Sortie de Wine 1.7.33</title> +<body> + La version de développement 1.7.33 de Wine est disponible. + <a href="{$root}/announce/1.7.33">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des commandes de copier-coller dans MSHTML.</li> + <li>Prise en charge supplémentaire des polices dans DirectWrite.</li> + <li>Meilleure gestion des pertes de focus dans les fenêtres Direct3D.</li> + <li>Plusieurs DLL jeux d'API supplémentaires.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Alexandre Julliard : Wine release 1.7.33
by Alexandre Julliard Dec. 12, 2014

Dec. 12, 2014

Module: website Branch: master Commit: 8fcdcb5cde1a827b3b666a9650149bb46b20b3ec URL: http://source.winehq.org/git/website.git/?a=commit;h=8fcdcb5cde1a827b3b666a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:56:01 2014 +0100 Wine release 1.7.33 --- news/en/2014121201.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2014121201.xml b/news/en/2014121201.xml new file mode 100644 index 0000000..039c35b --- /dev/null +++ b/news/en/2014121201.xml @@ -0,0 +1,16 @@ +<news> +<date>December 12, 2014</date> +<title>Wine 1.7.33 Released</title> +<body> + The Wine development release 1.7.33 is now available. + <a href="{$root}/announce/1.7.33">What's new</a> in this release: +<ul> + <li>Support for copy/paste commands in MSHTML.</li> + <li>Some more font support in DirectWrite.</li> + <li>Better handling for loss of focus in Direct3D windows.</li> + <li>Several more API Sets DLLs.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.33.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alistair Leslie-Hughes : d3dx9: Make ID3DXFont_PreloadCharacters return S_OK.
by Alexandre Julliard Dec. 12, 2014

Dec. 12, 2014

Module: wine Branch: master Commit: e5d7982c4d8b3c08c2d2c230b8b525a26d50fa76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7982c4d8b3c08c2d2c230b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Dec 11 14:22:51 2014 +1100 d3dx9: Make ID3DXFont_PreloadCharacters return S_OK. --- dlls/d3dx9_36/font.c | 2 +- dlls/d3dx9_36/tests/core.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 014fa95..dd1243e 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -155,7 +155,7 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) { FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index 2990893..b55f7ea 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -511,15 +511,14 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL); if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); - + } hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXFont_PreloadGlyphs(font, 1, 0); - ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); + todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); - } for(c = 'b'; c <= 'z'; c++) { WORD glyph; @@ -548,7 +547,7 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } hr = ID3DXFont_PreloadCharacters(font, 'a', 'z'); - todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n");

1 0

Alexandre Julliard : Release 1.7.33.
by Alexandre Julliard Dec. 12, 2014

Dec. 12, 2014

Module: wine Branch: master Commit: aa026e061446d5afee9d55b808402998fae94f1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa026e061446d5afee9d55b80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:46:47 2014 +0100 Release 1.7.33. --- ANNOUNCE | 540 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 284 insertions(+), 277 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa026e061446d5afee9d5…

1 0

Nikolay Sivov : dwrite_2.idl: Protect from D3DCOLORVALUE redefinition.
by Alexandre Julliard Dec. 12, 2014

Dec. 12, 2014

Module: wine Branch: master Commit: 099146a6f9990c17f857be364caf4683238a0ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=099146a6f9990c17f857be364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 12 14:35:49 2014 +0300 dwrite_2.idl: Protect from D3DCOLORVALUE redefinition. --- include/dwrite_2.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl index 26523da..d2960eb 100644 --- a/include/dwrite_2.idl +++ b/include/dwrite_2.idl @@ -47,6 +47,7 @@ typedef struct DWRITE_TEXT_METRICS1 FLOAT heightIncludingTrailingWhitespace; } DWRITE_TEXT_METRICS1; +cpp_quote("#ifndef D3DCOLORVALUE_DEFINED") typedef struct _D3DCOLORVALUE { union { @@ -66,6 +67,8 @@ typedef struct _D3DCOLORVALUE FLOAT dvA; }; } D3DCOLORVALUE; +cpp_quote("#define D3DCOLORVALUE_DEFINED") +cpp_quote("#endif") typedef D3DCOLORVALUE DWRITE_COLOR_F;

1 0

Tag wine-1.7.33 : Alexandre Julliard : Release 1.7.33
by Alexandre Julliard Dec. 12, 2014

Dec. 12, 2014

Module: wine Branch: refs/tags/wine-1.7.33 Tag: 7e8ab80caa6fb7726104096395ea851b353419b5 URL: http://source.winehq.org/git/wine.git/?a=tag;h=7e8ab80caa6fb7726104096395ea… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 12 20:46:47 2014 +0100 Release 1.7.33

1 0

Jacek Caban : dxgi1_2.idl: Added IDXGISwapChain1 declaration.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: ae1f015dab4eb6db007bdd38eca97e9eec6c69aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1f015dab4eb6db007bdd38e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 17:37:11 2014 +0100 dxgi1_2.idl: Added IDXGISwapChain1 declaration. --- include/dxgi1_2.idl | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.h | 12 ++++++++ 2 files changed, 97 insertions(+) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index 27dc34c..bba4ab8 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -24,6 +24,14 @@ typedef enum _DXGI_OFFER_RESOURCE_PRIORITY { DXGI_OFFER_RESOURCE_PRIORITY_HIGH } DXGI_OFFER_RESOURCE_PRIORITY; +typedef enum DXGI_ALPHA_MODE { + DXGI_ALPHA_MODE_UNSPECIFIED = 0, + DXGI_ALPHA_MODE_PREMULTIPLIED = 1, + DXGI_ALPHA_MODE_STRAIGHT = 2, + DXGI_ALPHA_MODE_IGNORE = 3, + DXGI_ALPHA_MODE_FORCE_DWORD = 0xffffffff +} DXGI_ALPHA_MODE; + [ object, uuid(05008617-fbfd-4051-a790-144884b4f6a9), @@ -45,3 +53,80 @@ interface IDXGIDevice2 : IDXGIDevice1 HRESULT EnqueueSetEvent( [in] HANDLE hEvent); } + +typedef enum DXGI_SCALING { + DXGI_SCALING_STRETCH = 0, + DXGI_SCALING_NONE = 1 +} DXGI_SCALING; + +typedef struct DXGI_SWAP_CHAIN_DESC1 { + UINT Width; + UINT Height; + DXGI_FORMAT Format; + BOOL Stereo; + DXGI_SAMPLE_DESC SampleDesc; + DXGI_USAGE BufferUsage; + UINT BufferCount; + DXGI_SCALING Scaling; + DXGI_SWAP_EFFECT SwapEffect; + DXGI_ALPHA_MODE AlphaMode; + UINT Flags; +} DXGI_SWAP_CHAIN_DESC1; + +typedef struct DXGI_SWAP_CHAIN_FULLSCREEN_DESC { + DXGI_RATIONAL RefreshRate; + DXGI_MODE_SCANLINE_ORDER ScanlineOrdering; + DXGI_MODE_SCALING Scaling; + BOOL Windowed; +} DXGI_SWAP_CHAIN_FULLSCREEN_DESC; + +typedef struct DXGI_PRESENT_PARAMETERS { + UINT DirtyRectsCount; + RECT *pDirtyRects; + RECT *pScrollRect; + POINT *pScrollOffset; +} DXGI_PRESENT_PARAMETERS; + +[ + object, + uuid(790a45f7-0d42-4876-983a-0a55cfe6f4aa), + local, + pointer_default(unique) +] +interface IDXGISwapChain1 : IDXGISwapChain +{ + HRESULT GetDesc1( + [out] DXGI_SWAP_CHAIN_DESC1 *pDesc); + + HRESULT GetFullscreenDesc( + [out] DXGI_SWAP_CHAIN_FULLSCREEN_DESC *pDesc); + + HRESULT GetHwnd( + [out] HWND *pHwnd); + + HRESULT GetCoreWindow( + [in] REFIID refiid, + [out] void **ppUnk); + + HRESULT Present1( + [in] UINT SyncInterval, + [in] UINT PresentFlags, + [in] const DXGI_PRESENT_PARAMETERS *pPresentParameters); + + BOOL IsTemporaryMonoSupported(); + + HRESULT GetRestrictToOutput( + [out] IDXGIOutput **ppRestrictToOutput); + + HRESULT SetBackgroundColor( + [in] const DXGI_RGBA *pColor); + + HRESULT GetBackgroundColor( + [out] DXGI_RGBA *pColor); + + HRESULT SetRotation( + [in] DXGI_MODE_ROTATION Rotation); + + HRESULT GetRotation( + [out] DXGI_MODE_ROTATION *pRotation); +} diff --git a/include/dxgitype.h b/include/dxgitype.h index e89e055..13df046 100644 --- a/include/dxgitype.h +++ b/include/dxgitype.h @@ -21,6 +21,18 @@ #include "dxgiformat.h" +#ifndef D3DCOLORVALUE_DEFINED +typedef struct _D3DCOLORVALUE { + float r; + float g; + float b; + float a; +} D3DCOLORVALUE; +#define D3DCOLORVALUE_DEFINED +#endif + +typedef D3DCOLORVALUE DXGI_RGBA; + typedef struct DXGI_SAMPLE_DESC { UINT Count; UINT Quality;

1 0

Austin English : mfreadwrite: Add stub dll.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 89ecba6c48bdb74595740b012c01d226c9d11595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ecba6c48bdb74595740b012… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 10 15:51:07 2014 -0800 mfreadwrite: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/mfreadwrite/Makefile.in | 4 ++++ dlls/mfreadwrite/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/mfreadwrite.spec | 7 +++++++ 5 files changed, 52 insertions(+) diff --git a/configure b/configure index eebde01..a9ee86f 100755 --- a/configure +++ b/configure @@ -1097,6 +1097,7 @@ enable_mciqtz32 enable_mciseq enable_mciwave enable_mfplat +enable_mfreadwrite enable_mgmtapi enable_midimap enable_mlang @@ -17180,6 +17181,7 @@ wine_fn_config_dll mciqtz32 enable_mciqtz32 wine_fn_config_dll mciseq enable_mciseq wine_fn_config_dll mciwave enable_mciwave wine_fn_config_dll mfplat enable_mfplat +wine_fn_config_dll mfreadwrite enable_mfreadwrite wine_fn_config_dll mgmtapi enable_mgmtapi wine_fn_config_dll midimap enable_midimap wine_fn_config_dll mlang enable_mlang clean,implib diff --git a/configure.ac b/configure.ac index 9458b2b..de6d2cc 100644 --- a/configure.ac +++ b/configure.ac @@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(mciqtz32) WINE_CONFIG_DLL(mciseq) WINE_CONFIG_DLL(mciwave) WINE_CONFIG_DLL(mfplat) +WINE_CONFIG_DLL(mfreadwrite) WINE_CONFIG_DLL(mgmtapi) WINE_CONFIG_DLL(midimap) WINE_CONFIG_DLL(mlang,,[clean,implib]) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in new file mode 100644 index 0000000..7cf3a59 --- /dev/null +++ b/dlls/mfreadwrite/Makefile.in @@ -0,0 +1,4 @@ +MODULE = mfreadwrite.dll + +C_SRCS = \ + main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c new file mode 100644 index 0000000..a72f634 --- /dev/null +++ b/dlls/mfreadwrite/main.c @@ -0,0 +1,38 @@ +/* + * + * Copyright 2014 Austin English + * + * 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 "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/mfreadwrite/mfreadwrite.spec b/dlls/mfreadwrite/mfreadwrite.spec new file mode 100644 index 0000000..1f9f30f --- /dev/null +++ b/dlls/mfreadwrite/mfreadwrite.spec @@ -0,0 +1,7 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub MFCreateSinkWriterFromMediaSink +@ stub MFCreateSinkWriterFromURL +@ stub MFCreateSourceReaderFromByteStream +@ stub MFCreateSourceReaderFromMediaSource +@ stub MFCreateSourceReaderFromURL

1 0

Nikolay Sivov : regsvr32: Update program version.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: 37d5149ea59b8c70606e8451afff7272741441e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37d5149ea59b8c70606e8451a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 11 18:59:58 2014 +0300 regsvr32: Update program version. --- programs/regsvr32/regsvr32.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/regsvr32/regsvr32.rc b/programs/regsvr32/regsvr32.rc index 9b951b1..88ba364 100644 --- a/programs/regsvr32/regsvr32.rc +++ b/programs/regsvr32/regsvr32.rc @@ -53,10 +53,10 @@ Options:\n\ #define WINE_FILEDESCRIPTION_STR "Wine Register Server" #define WINE_FILENAME_STR "REGSVR32.EXE" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 5,0,1586,1 -#define WINE_FILEVERSION_STR "5.0.1586.1" +#define WINE_FILEVERSION 5,1,2600,2180 +#define WINE_FILEVERSION_STR "5.1.2600.2180" -#define WINE_PRODUCTVERSION 5,0,1586,1 -#define WINE_PRODUCTVERSION_STR "5.0" +#define WINE_PRODUCTVERSION 5,1,2600,2180 +#define WINE_PRODUCTVERSION_STR "5.1" #include "wine/wine_common_ver.rc"

1 0

Jacek Caban : mshtml: Added IHTMLObjectElement2:: put_classid semi-stub implementation.
by Alexandre Julliard Dec. 11, 2014

Dec. 11, 2014

Module: wine Branch: master Commit: da9fa9e80c9c377608369c29c5ba39e85a074dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da9fa9e80c9c377608369c29c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 11 16:26:18 2014 +0100 mshtml: Added IHTMLObjectElement2::put_classid semi-stub implementation. --- dlls/mshtml/htmlobject.c | 25 ++++++++++++-- dlls/mshtml/tests/activex.c | 83 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 102 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 2a8ccfa..a12384f 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -575,8 +575,29 @@ static HRESULT WINAPI HTMLObjectElement2_namedRecordset(IHTMLObjectElement2 *ifa static HRESULT WINAPI HTMLObjectElement2_put_classid(IHTMLObjectElement2 *iface, BSTR v) { HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + HRESULT hres; + + static const WCHAR classidW[] = {'c','l','a','s','s','i','d',0}; + + FIXME("(%p)->(%s) semi-stub\n", This, debugstr_w(v)); + + hres = elem_string_attr_setter(&This->plugin_container.element, classidW, v); + if(FAILED(hres)) + return hres; + + if(This->plugin_container.plugin_host) { + FIXME("Host already asociated.\n"); + return E_NOTIMPL; + } + + /* + * NOTE: + * If the element is not yet in DOM tree, we should embed it as soon as it's added. + * However, Gecko for some reason decides not to create NP plugin in this case, + * so this won't work. + */ + + return create_plugin_host(This->plugin_container.element.node.doc, &This->plugin_container); } static HRESULT WINAPI HTMLObjectElement2_get_classid(IHTMLObjectElement2 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 852f81d..783b976 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -217,6 +217,7 @@ static BSTR a2bstr(const char *str) static IOleClientSite *client_site; static IDispatch *sink_disp; static READYSTATE plugin_readystate = READYSTATE_UNINITIALIZED; +static BOOL have_container; static void set_plugin_readystate(READYSTATE state) { @@ -468,15 +469,19 @@ static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, QACONTA ok(!container->pUnkEventSink, "container->pUnkEventSink != NULL\n"); ok(container->dwAmbientFlags == (QACONTAINER_SUPPORTSMNEMONICS|QACONTAINER_MESSAGEREFLECT|QACONTAINER_USERMODE), "container->dwAmbientFlags = %x\n", container->dwAmbientFlags); - ok(!container->colorFore, "container->colorFore == 0\n"); /* FIXME */ + if(have_container) + ok(!container->colorFore, "container->colorFore = %d\n", container->colorFore); /* FIXME */ todo_wine ok(container->colorBack, "container->colorBack == 0\n"); /* FIXME */ - todo_wine - ok(container->pFont != NULL, "container->pFont == NULL\n"); + if(have_container) + todo_wine ok(container->pFont != NULL, "container->pFont == NULL\n"); + else + ok(!container->pFont, "container->pFont = %p\n", container->pFont); todo_wine ok(container->pUndoMgr != NULL, "container->pUndoMgr == NULL\n"); ok(!container->dwAppearance, "container->dwAppearance = %x\n", container->dwAppearance); - ok(!container->lcid, "container->lcid = %x\n", container->lcid); + if(have_container) + ok(!container->lcid, "container->lcid = %x\n", container->lcid); ok(!container->hpal, "container->hpal = %p\n", container->hpal); ok(!container->pBindHost, "container->pBindHost != NULL\n"); ok(!container->pOleControlSite, "container->pOleControlSite != NULL\n"); @@ -2366,6 +2371,7 @@ static void init_test(int behavior) activex_refcnt = 0; no_quickact = behavior == TEST_NOQUICKACT || behavior == TEST_DISPONLY; + have_container = TRUE; } static void test_event_call(void) @@ -2594,6 +2600,73 @@ static void test_nooleobj_ax(void) release_doc(doc); } +static void test_exec_script(IHTMLDocument2 *doc, const char *codea, const char *langa) +{ + IHTMLWindow2 *window; + BSTR code, lang; + VARIANT v; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + code = a2bstr(codea); + lang = a2bstr(langa); + + hres = IHTMLWindow2_execScript(window, code, lang, &v); + ok(hres == S_OK, "execScript failed: %08x\n", hres); + SysFreeString(lang); + VariantClear(&v); + + IHTMLWindow2_Release(window); +} + +static void test_create_element(void) +{ + IHTMLDocument2 *doc; + + init_test(TEST_FLASH); + + doc = create_doc("<html></html>"); + + have_container = FALSE; + + SET_EXPECT(CreateInstance); + SET_EXPECT(FreezeEvents_TRUE); + SET_EXPECT(QuickActivate); + SET_EXPECT(IPersistPropertyBag_InitNew); + SET_EXPECT(Invoke_READYSTATE); + SET_EXPECT(FreezeEvents_FALSE); + + test_exec_script(doc, + "var test_elem = document.createElement('object');" + "test_elem.classid = 'CLSID:178fc163-f585-4e24-9c13-4bb7f6680746';", + "javascript"); + + CHECK_CALLED(CreateInstance); + todo_wine CHECK_CALLED(FreezeEvents_TRUE); + CHECK_CALLED(QuickActivate); + CHECK_CALLED(IPersistPropertyBag_InitNew); + CHECK_CALLED(Invoke_READYSTATE); + todo_wine CHECK_CALLED(FreezeEvents_FALSE); + + have_container = TRUE; + + SET_EXPECT(DoVerb); + test_exec_script(doc, + "document.body.appendChild(test_elem);", + "javascript"); + todo_wine CHECK_CALLED(DoVerb); + + SET_EXPECT(InPlaceDeactivate); + SET_EXPECT(Close); + SET_EXPECT(SetClientSite_NULL); + release_doc(doc); + todo_wine CHECK_CALLED(InPlaceDeactivate); + CHECK_CALLED(Close); + CHECK_CALLED(SetClientSite_NULL); +} + static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { return DefWindowProcW(hwnd, msg, wParam, lParam); @@ -2730,6 +2803,8 @@ START_TEST(activex) test_nooleobj_ax(); trace("Testing event object binding...\n"); test_event_binding(); + trace("Testing createElement(object)...\n"); + test_create_element(); init_registry(FALSE); }else { skip("Could not register ActiveX\n");

1 0