March 2014 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dx9: Correctly handle empty parameter data.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 7617951dfd2e66117d7adbb53f47b5b71e2b84b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7617951dfd2e66117d7adbb53… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:10 2014 +0100 d3dx9: Correctly handle empty parameter data. --- dlls/d3dx9_36/effect.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 260dfa5..9530687 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4332,6 +4332,9 @@ static HRESULT d3dx9_copy_data(struct d3dx_object *object, const char **ptr) read_dword(ptr, &object->size); TRACE("Data size: %#x\n", object->size); + if (!object->size) + return D3D_OK; + object->data = HeapAlloc(GetProcessHeap(), 0, object->size); if (!object->data) {

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcDelete.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: b6a3e9be42373bf08894680aa3713a55bb7a674a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6a3e9be42373bf08894680aa… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:41 2014 +0900 schedsvc: Implement SchRpcDelete. --- dlls/schedsvc/schedsvc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index def6367..cc52321 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -197,8 +197,28 @@ HRESULT __cdecl SchRpcRun(const WCHAR *path, DWORD n_args, const WCHAR **args, D HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) { - WINE_FIXME("%s,%#x: stub\n", wine_dbgstr_w(path), flags); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr = S_OK; + + WINE_TRACE("%s,%#x\n", wine_dbgstr_w(path), flags); + + if (flags) return E_INVALIDARG; + + while (*path == '\\' || *path == '/') path++; + if (!*path) return E_ACCESSDENIED; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + if (!RemoveDirectoryW(full_name)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + if (hr == HRESULT_FROM_WIN32(ERROR_DIRECTORY)) + hr = DeleteFileW(full_name) ? S_OK : HRESULT_FROM_WIN32(GetLastError()); + } + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcRename(const WCHAR *path, const WCHAR *name, DWORD flags)

1 0

Jactry Zeng : riched20/tests: Fix a SysAllocString leak.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: fa2c5092434379ef3e0c5ea2b014acea42043925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2c5092434379ef3e0c5ea2b… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Thu Mar 13 20:49:18 2014 +0800 riched20/tests: Fix a SysAllocString leak. --- dlls/riched20/tests/richole.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 3781e68..5bfb999 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -190,7 +190,7 @@ static void test_ITextDocument_Open(void) int tomNumSingle = sizeof(tomConstantsSingle)/sizeof(tomConstantsSingle[0]); int tomNumMulti = sizeof(tomConstantsMulti)/sizeof(tomConstantsMulti[0]); int i; - VariantInit(&testfile); + V_VT(&testfile) = VT_BSTR; V_BSTR(&testfile) = SysAllocString(filename); @@ -378,6 +378,8 @@ static void test_ITextDocument_Open(void) todo_wine ok(result == 0, "ITextDocument_Open: Test UTF-16 set wrong text: Result: %s\n", wine_dbgstr_w(bufUnicode)); release_interfaces(&w, &reOle, &txtDoc, &txtSel); DeleteFileW(filename); + + VariantClear(&testfile); } START_TEST(richole)

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcRegisterTask.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: adab8514e4b7203c0d92e57df2e767dae05d6f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adab8514e4b7203c0d92e57df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:45 2014 +0900 schedsvc: Implement SchRpcRegisterTask. --- dlls/schedsvc/schedsvc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 105 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index cc52321..a527ab4 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -22,6 +22,7 @@ #include "windef.h" #include "schrpc.h" +#include "taskschd.h" #include "wine/debug.h" #include "schedsvc_private.h" @@ -102,13 +103,115 @@ static HRESULT create_directory(const WCHAR *path) return hr; } +static HRESULT write_xml_utf8(const WCHAR *name, DWORD disposition, const WCHAR *xmlW) +{ + static const char bom_utf8[] = { 0xef,0xbb,0xbf }; + static const char comment[] = "\n"; + HANDLE hfile; + DWORD size; + char *xml; + HRESULT hr = S_OK; + + hfile = CreateFileW(name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + { + if (GetLastError() == ERROR_FILE_EXISTS) + return HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS); + + return HRESULT_FROM_WIN32(GetLastError()); + } + + size = WideCharToMultiByte(CP_UTF8, 0, xmlW, -1, NULL, 0, NULL, NULL); + xml = heap_alloc(size); + if (!xml) + { + CloseHandle(hfile); + return E_OUTOFMEMORY; + } + WideCharToMultiByte(CP_UTF8, 0, xmlW, -1, xml, size, NULL, NULL); + + if (!WriteFile(hfile, bom_utf8, sizeof(bom_utf8), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + if (!WriteFile(hfile, comment, strlen(comment), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* skip XML declaration with UTF-16 specifier */ + if (!memcmp(xml, "<?xml", 5)) + { + const char *p = strchr(xml, '>'); + if (p++) while (isspace(*p)) p++; + else p = xml; + if (!WriteFile(hfile, p, strlen(p), &size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + else + { + if (!WriteFile(hfile, xml, strlen(xml), &size, NULL)) + hr = HRESULT_FROM_WIN32(GetLastError()); + } + +failed: + heap_free(xml); + CloseHandle(hfile); + return hr; +} + HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl, DWORD task_logon_type, DWORD n_creds, const TASK_USER_CRED *creds, WCHAR **actual_path, TASK_XML_ERROR_INFO **xml_error_info) { - WINE_FIXME("%s,%s,%#x,%s,%u,%u,%p,%p,%p: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(xml), flags, + WCHAR *full_name, *relative_path; + DWORD disposition; + HRESULT hr; + + WINE_TRACE("%s,%s,%#x,%s,%u,%u,%p,%p,%p\n", wine_dbgstr_w(path), wine_dbgstr_w(xml), flags, wine_dbgstr_w(sddl), task_logon_type, n_creds, creds, actual_path, xml_error_info); - return E_NOTIMPL; + + *actual_path = NULL; + *xml_error_info = NULL; + + /* FIXME: assume that validation is performed on the client side */ + if (flags & TASK_VALIDATE_ONLY) return S_OK; + + full_name = get_full_name(path, &relative_path); + if (!full_name) return E_OUTOFMEMORY; + + if (strchrW(path, '\\') || strchrW(path, '/')) + { + WCHAR *p = strrchrW(full_name, '/'); + if (!p) p = strrchrW(full_name, '\\'); + *p = 0; + hr = create_directory(full_name); + *p = '\\'; + } + + switch (flags & (TASK_CREATE | TASK_UPDATE)) + { + default: + case TASK_CREATE: + disposition = CREATE_NEW; + break; + + case TASK_UPDATE: + disposition = OPEN_EXISTING; + break; + + case (TASK_CREATE | TASK_UPDATE): + disposition = OPEN_ALWAYS; + break; + } + + hr = write_xml_utf8(full_name, disposition, xml); + if (hr == S_OK) *actual_path = heap_strdupW(relative_path); + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, ULONG *n_languages, WCHAR **xml)

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcHighestVersion.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 2463e44f61976bb1f233c36e6c68c91b205e80da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2463e44f61976bb1f233c36e6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:33 2014 +0900 schedsvc: Implement SchRpcHighestVersion. --- dlls/schedsvc/schedsvc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 9b9d7c5..400ab5d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -28,8 +28,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); HRESULT __cdecl SchRpcHighestVersion(DWORD *version) { - WINE_FIXME("%p: stub\n", version); - return E_NOTIMPL; + WINE_TRACE("%p\n", version); + + *version = MAKELONG(3, 1); + return S_OK; } HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl,

1 0

Dmitry Timoshkov : schedsvc: Implement SchRpcCreateFolder.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 3266b490f72ab231262ed2e37ebaf3e0d65ce1e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3266b490f72ab231262ed2e37… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Mar 7 12:10:37 2014 +0900 schedsvc: Implement SchRpcCreateFolder. --- dlls/schedsvc/schedsvc.c | 84 +++++++++++++++++++++++++++++++++++++- dlls/schedsvc/schedsvc_private.h | 53 ++++++++++++++++++++++++ loader/wine.inf.in | 1 + 3 files changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 400ab5d..def6367 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -24,6 +24,8 @@ #include "schrpc.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); HRESULT __cdecl SchRpcHighestVersion(DWORD *version) @@ -34,6 +36,72 @@ HRESULT __cdecl SchRpcHighestVersion(DWORD *version) return S_OK; } +static WCHAR *get_full_name(const WCHAR *path, WCHAR **relative_path) +{ + static const WCHAR tasksW[] = { '\\','t','a','s','k','s','\\',0 }; + WCHAR *target; + int len; + + len = GetSystemDirectoryW(NULL, 0); + len += strlenW(tasksW) + strlenW(path); + + target = heap_alloc(len * sizeof(WCHAR)); + if (target) + { + GetSystemDirectoryW(target, len); + strcatW(target, tasksW); + if (relative_path) + *relative_path = target + strlenW(target) - 1; + while (*path == '\\') path++; + strcatW(target, path); + } + return target; +} + +/* + * Recursively create all directories in the path. + */ +static HRESULT create_directory(const WCHAR *path) +{ + HRESULT hr = S_OK; + WCHAR *new_path; + int len; + + new_path = heap_alloc((strlenW(path) + 1) * sizeof(WCHAR)); + if (!new_path) return E_OUTOFMEMORY; + + strcpyW(new_path, path); + + len = strlenW(new_path); + while (len && new_path[len - 1] == '\\') + { + new_path[len - 1] = 0; + len--; + } + + while (!CreateDirectoryW(new_path, NULL)) + { + WCHAR *slash; + DWORD last_error = GetLastError(); + + if (last_error == ERROR_ALREADY_EXISTS || last_error != ERROR_PATH_NOT_FOUND || + !(slash = strrchrW(new_path, '\\'))) + { + hr = HRESULT_FROM_WIN32(last_error); + break; + } + + len = slash - new_path; + new_path[len] = 0; + hr = create_directory(new_path); + if (hr != S_OK) break; + new_path[len] = '\\'; + } + + heap_free(new_path); + return hr; +} + HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD flags, const WCHAR *sddl, DWORD task_logon_type, DWORD n_creds, const TASK_USER_CRED *creds, WCHAR **actual_path, TASK_XML_ERROR_INFO **xml_error_info) @@ -51,8 +119,20 @@ HRESULT __cdecl SchRpcRetrieveTask(const WCHAR *path, const WCHAR *languages, UL HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD flags) { - WINE_FIXME("%s,%s,%#x: stub\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); - return E_NOTIMPL; + WCHAR *full_name; + HRESULT hr; + + WINE_TRACE("%s,%s,%#x\n", wine_dbgstr_w(path), wine_dbgstr_w(sddl), flags); + + if (flags) return E_INVALIDARG; + + full_name = get_full_name(path, NULL); + if (!full_name) return E_OUTOFMEMORY; + + hr = create_directory(full_name); + + heap_free(full_name); + return hr; } HRESULT __cdecl SchRpcSetSecurity(const WCHAR *path, const WCHAR *sddl, DWORD flags) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h new file mode 100644 index 0000000..082bda5 --- /dev/null +++ b/dlls/schedsvc/schedsvc_private.h @@ -0,0 +1,53 @@ +/* + * Copyright 2014 Dmitry Timoshkov + * + * 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 + */ + +#ifndef __WINE_SCHEDSVC_PRIVATE_H__ +#define __WINE_SCHEDSVC_PRIVATE_H__ + +#include "wine/unicode.h" + +static void *heap_alloc_zero(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc_zero(SIZE_T size) +{ + void *ptr = MIDL_user_allocate(size); + if (ptr) memset(ptr, 0, size); + return ptr; +} + +static void *heap_alloc(SIZE_T size) __WINE_ALLOC_SIZE(1); +static inline void *heap_alloc(SIZE_T size) +{ + return MIDL_user_allocate(size); +} + +static inline void heap_free(void *ptr) +{ + MIDL_user_free(ptr); +} + +static inline WCHAR *heap_strdupW(const WCHAR *src) +{ + WCHAR *dst; + unsigned len; + if (!src) return NULL; + len = (strlenW(src) + 1) * sizeof(WCHAR); + if ((dst = heap_alloc(len))) memcpy(dst, src, len); + return dst; +} + +#endif /* __WINE_SCHEDSVC_PRIVATE_H__ */ diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 7486cfd..d6e6994 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2513,6 +2513,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,logs, 10,temp, 11,mui, +11,tasks, 11,spool\drivers\color, 11,spool\printers, 10,,explorer.exe

1 0

Matteo Bruni : d3dx9/tests: Skip a test if DXTn texture formats are not supported.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: d6a919af89d5154e8892f0bcddf961a86fdcc43e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a919af89d5154e8892f0bcd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 13 16:31:08 2014 +0100 d3dx9/tests: Skip a test if DXTn texture formats are not supported. --- dlls/d3dx9_36/tests/texture.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index aea09d5..1a85d15 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -341,15 +341,22 @@ static void test_D3DXCheckTextureRequirements(IDirect3DDevice9 *device) ok(format == expected, "Returned format %u, expected %u\n", format, expected); /* Block-based texture formats and size < block size. */ - format = D3DFMT_DXT1; - width = 2; height = 2; - mipmaps = 1; - hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); - ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); - ok(width == 4, "Returned width %d, expected %d\n", width, 4); - ok(height == 4, "Returned height %d, expected %d\n", height, 4); - ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); - ok(format == D3DFMT_DXT1, "Returned format %u, expected %u\n", format, D3DFMT_DXT1); + if (has_2d_dxt5) + { + format = D3DFMT_DXT5; + width = 2; height = 2; + mipmaps = 1; + hr = D3DXCheckTextureRequirements(device, &width, &height, &mipmaps, 0, &format, D3DPOOL_DEFAULT); + ok(hr == D3D_OK, "D3DXCheckTextureRequirements returned %#x, expected %#x\n", hr, D3D_OK); + ok(width == 4, "Returned width %d, expected %d\n", width, 4); + ok(height == 4, "Returned height %d, expected %d\n", height, 4); + ok(mipmaps == 1, "Returned mipmaps %d, expected %d\n", mipmaps, 1); + ok(format == D3DFMT_DXT5, "Returned format %u, expected %u\n", format, D3DFMT_DXT5); + } + else + { + skip("D3DFMT_DXT5 textures are not supported, skipping a test.\n"); + } IDirect3D9_Release(d3d); }

1 0

Jacek Caban : mshtml: Added IHTMLDocument7 stub implementation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: e5dbd6e9f0e1b0b90568387d798775175059f893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5dbd6e9f0e1b0b90568387d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:13:11 2014 +0100 mshtml: Added IHTMLDocument7 stub implementation. --- dlls/ieframe/ieframe.h | 2 +- dlls/ieframe/navigate.c | 104 +---- dlls/mshtml/htmldoc.c | 903 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/navigate.c | 6 +- 5 files changed, 928 insertions(+), 88 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5dbd6e9f0e1b0b905683…

1 0

Jacek Caban : mshtml: Skip tests depending on iframe onload event on IEs older than IE9.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 74067c56b1460205946e3460ac0db3e06eb224a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74067c56b1460205946e3460a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:13:30 2014 +0100 mshtml: Skip tests depending on iframe onload event on IEs older than IE9. --- dlls/mshtml/tests/events.c | 123 +++++++++++++++++++++++++++----------------- dlls/mshtml/tests/script.c | 64 ++++++++++++++++------- 2 files changed, 119 insertions(+), 68 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index d1a36f0..6755591 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -89,6 +89,7 @@ static HWND container_hwnd = NULL; static IHTMLWindow2 *window; static IOleDocumentView *view; static BOOL xy_todo; +static BOOL is_ie9plus; typedef struct { LONG x; @@ -2170,13 +2171,11 @@ static IHTMLDocument2* get_iframe_doc(IHTMLIFrameElement *iframe) static void test_iframe_connections(IHTMLDocument2 *doc) { - IHTMLFrameBase2 *frame_base2; IHTMLIFrameElement *iframe; IHTMLDocument2 *iframes_doc; DWORD cookie; IConnectionPoint *cp; IHTMLElement *element; - VARIANT v; BSTR str; HRESULT hres; @@ -2198,33 +2197,40 @@ static void test_iframe_connections(IHTMLDocument2 *doc) unregister_cp((IUnknown*)iframes_doc, &IID_IDispatch, cookie); - hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); - ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); + if(is_ie9plus) { + IHTMLFrameBase2 *frame_base2; + VARIANT v; - V_VT(&v) = VT_DISPATCH; - V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; - hres = IHTMLFrameBase2_put_onload(frame_base2, v); - ok(hres == S_OK, "put_onload failed: %08x\n", hres); + hres = IHTMLIFrameElement_QueryInterface(iframe, &IID_IHTMLFrameBase2, (void**)&frame_base2); + ok(hres == S_OK, "Could not get IHTMLFrameBase2 iface: %08x\n", hres); - IHTMLFrameBase2_Release(frame_base2); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&iframe_onload_obj; + hres = IHTMLFrameBase2_put_onload(frame_base2, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); - str = a2bstr("about:blank"); - hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); - SysFreeString(str); + IHTMLFrameBase2_Release(frame_base2); - SET_EXPECT(iframe_onload); - pump_msgs(&called_iframe_onload); - CHECK_CALLED(iframe_onload); + str = a2bstr("about:blank"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); - str = a2bstr("about:test"); - hres = IHTMLDocument2_put_URL(iframes_doc, str); - ok(hres == S_OK, "put_URL failed: %08x\n", hres); - SysFreeString(str); + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); - SET_EXPECT(iframe_onload); - pump_msgs(&called_iframe_onload); - CHECK_CALLED(iframe_onload); + str = a2bstr("about:test"); + hres = IHTMLDocument2_put_URL(iframes_doc, str); + ok(hres == S_OK, "put_URL failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(iframe_onload); + pump_msgs(&called_iframe_onload); + CHECK_CALLED(iframe_onload); + }else { + win_skip("Skipping iframe onload tests on IE older than 9.\n"); + } IHTMLDocument2_Release(iframes_doc); } @@ -2733,24 +2739,12 @@ static void set_client_site(IHTMLDocument2 *doc, BOOL set) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; - IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); - if (FAILED(hres)) - return NULL; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(FAILED(hres)) { - win_skip("Could not get IHTMLDocument5 interface, probably too old IE\n"); - IHTMLDocument2_Release(doc); - return NULL; - } - - IHTMLDocument5_Release(doc5); - return doc; + return SUCCEEDED(hres) ? doc : NULL; } @@ -2851,24 +2845,57 @@ static void test_empty_document(void) IHTMLDocument2_Release(doc); } +static BOOL check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) + IHTMLDocument5_Release(doc5); + + IHTMLDocument2_Release(doc); + return SUCCEEDED(hres); +} + START_TEST(events) { CoInitialize(NULL); - container_hwnd = create_container_window(); - if(winetest_interactive) - ShowWindow(container_hwnd, SW_SHOW); + if(check_ie()) { + container_hwnd = create_container_window(); - run_test(empty_doc_str, test_timeout); - run_test(click_doc_str, test_onclick); - run_test(readystate_doc_str, test_onreadystatechange); - run_test(img_doc_str, test_imgload); - run_test(input_doc_str, test_focus); - run_test(form_doc_str, test_submit); - run_test(iframe_doc_str, test_iframe_connections); + if(winetest_interactive) + ShowWindow(container_hwnd, SW_SHOW); - test_empty_document(); + run_test(empty_doc_str, test_timeout); + run_test(click_doc_str, test_onclick); + run_test(readystate_doc_str, test_onreadystatechange); + run_test(img_doc_str, test_imgload); + run_test(input_doc_str, test_focus); + run_test(form_doc_str, test_submit); + run_test(iframe_doc_str, test_iframe_connections); + + test_empty_document(); + + DestroyWindow(container_hwnd); + }else { + win_skip("Too old IE\n"); + } - DestroyWindow(container_hwnd); CoUninitialize(); } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index de0bf65..df52a75 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -150,6 +150,7 @@ static const GUID CLSID_TestScript = static const GUID CLSID_TestActiveX = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; +static BOOL is_ie9plus; static IHTMLDocument2 *notif_doc; static IOleDocumentView *view; static IDispatchEx *window_dispex; @@ -1165,23 +1166,12 @@ static HRESULT QueryInterface(REFIID riid, void **ppv) static IHTMLDocument2 *create_document(void) { IHTMLDocument2 *doc; - IHTMLDocument5 *doc5; HRESULT hres; hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IHTMLDocument2, (void**)&doc); ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); - if (hres != S_OK) return NULL; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(FAILED(hres)) { - win_skip("Could not get IHTMLDocument5, probably too old IE\n"); - IHTMLDocument2_Release(doc); - return NULL; - } - - IHTMLDocument5_Release(doc5); - return doc; + return SUCCEEDED(hres) ? doc : NULL; } static void load_string(IHTMLDocument2 *doc, const char *str) @@ -2831,7 +2821,10 @@ static void run_js_tests(void) run_js_script("exectest.html"); run_js_script("vbtest.html"); run_js_script("events.html"); - run_js_script("nav_test.html"); + if(is_ie9plus) + run_js_script("nav_test.html"); + else + win_skip("Skipping nav_test.html on IE older than 9 (for broken ieframe onload).\n"); } static BOOL init_registry(BOOL init) @@ -2883,21 +2876,52 @@ static HWND create_container_window(void) 300, 300, NULL, NULL, NULL, NULL); } +static BOOL check_ie(void) +{ + IHTMLDocument2 *doc; + IHTMLDocument5 *doc5; + IHTMLDocument7 *doc7; + HRESULT hres; + + doc = create_document(); + if(!doc) + return FALSE; + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument7, (void**)&doc7); + if(SUCCEEDED(hres)) { + is_ie9plus = TRUE; + IHTMLDocument7_Release(doc7); + } + + trace("is_ie9plus %x\n", is_ie9plus); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); + if(SUCCEEDED(hres)) + IHTMLDocument5_Release(doc5); + + IHTMLDocument2_Release(doc); + return SUCCEEDED(hres); +} + START_TEST(script) { CoInitialize(NULL); container_hwnd = create_container_window(); - if(winetest_interactive || ! is_ie_hardened()) { - if(register_script_engine()) { - test_simple_script(); - init_registry(FALSE); + if(check_ie()) { + if(winetest_interactive || ! is_ie_hardened()) { + if(register_script_engine()) { + test_simple_script(); + init_registry(FALSE); + }else { + skip("Could not register TestScript engine\n"); + } + run_js_tests(); }else { - skip("Could not register TestScript engine\n"); + skip("IE running in Enhanced Security Configuration\n"); } - run_js_tests(); }else { - skip("IE running in Enhanced Security Configuration\n"); + win_skip("Too old IE.\n"); } DestroyWindow(container_hwnd);

1 0

Jacek Caban : mshtml: Added support for target attribute in submit function implementation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 992fa4802091c943d10be5fca22852442e48e241 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992fa4802091c943d10be5fca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 13 14:47:14 2014 +0100 mshtml: Added support for target attribute in submit function implementation. --- dlls/mshtml/htmlanchor.c | 95 +++++++++++++++++++++++++++--------------- dlls/mshtml/htmlform.c | 22 ++++++++-- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 81 insertions(+), 37 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index f177ff2..a9187a4 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -70,51 +70,81 @@ static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *targ return hres; } +HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_str, BOOL *use_new_window) +{ + HTMLOuterWindow *top_window, *ret_window; + const PRUnichar *target; + HRESULT hres; + + static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; + static const WCHAR _selfW[] = {'_','s','e','l','f',0}; + static const WCHAR _topW[] = {'_','t','o','p',0}; + + *use_new_window = FALSE; + + nsAString_GetData(target_str, &target); + TRACE("%s\n", debugstr_w(target)); + + if(!*target || !strcmpiW(target, _selfW)) { + IHTMLWindow2_AddRef(&window->base.IHTMLWindow2_iface); + return window; + } + + if(!strcmpiW(target, _topW)) { + get_top_window(window, &top_window); + IHTMLWindow2_AddRef(&top_window->base.IHTMLWindow2_iface); + return top_window; + } + + if(!strcmpiW(target, _parentW)) { + if(!window->parent) { + WARN("Window has no parent\n"); + return NULL; + } + + IHTMLWindow2_AddRef(&window->parent->base.IHTMLWindow2_iface); + return window->parent; + } + + get_top_window(window, &top_window); + + hres = get_frame_by_name(top_window, target, TRUE, &ret_window); + if(FAILED(hres) || !ret_window) { + *use_new_window = TRUE; + return NULL; + } + + IHTMLWindow2_AddRef(&ret_window->base.IHTMLWindow2_iface); + return ret_window; +} + static HRESULT navigate_anchor(HTMLAnchorElement *This) { nsAString href_str, target_str; - HTMLOuterWindow *window = NULL; + HTMLOuterWindow *window; + BOOL use_new_window; nsresult nsres; HRESULT hres = E_FAIL; - static const WCHAR _parentW[] = {'_','p','a','r','e','n','t',0}; - static const WCHAR _selfW[] = {'_','s','e','l','f',0}; - static const WCHAR _topW[] = {'_','t','o','p',0}; nsAString_Init(&target_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); - if(NS_SUCCEEDED(nsres)) { + if(NS_FAILED(nsres)) + return E_FAIL; + + window = get_target_window(This->element.node.doc->basedoc.window, &target_str, &use_new_window); + if(!window && use_new_window) { const PRUnichar *target; nsAString_GetData(&target_str, &target); - TRACE("target %s\n", debugstr_w(target)); - if(*target && strcmpiW(target, _selfW)) { - if(!strcmpiW(target, _topW)) { - TRACE("target _top\n"); - get_top_window(This->element.node.doc->basedoc.window, &window); - }else if(!strcmpiW(target, _parentW)) { - window = This->element.node.doc->basedoc.window; - if(!window->parent) { - WARN("Window has no parent\n"); - nsAString_Finish(&target_str); - return S_OK; - } - window = window->parent; - }else { - HTMLOuterWindow *top_window; - - get_top_window(This->element.node.doc->basedoc.window, &top_window); - - hres = get_frame_by_name(top_window, target, TRUE, &window); - if(FAILED(hres) || !window) { - hres = navigate_anchor_window(This, target); - nsAString_Finish(&target_str); - return hres; - } - } - } + hres = navigate_anchor_window(This, target); + nsAString_Finish(&target_str); + return hres; } + nsAString_Finish(&target_str); + if(!window) + return S_OK; nsAString_Init(&href_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); @@ -123,8 +153,6 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) nsAString_GetData(&href_str, &href); if(*href) { - if(!window) - window = This->element.node.doc->basedoc.window; hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); }else { TRACE("empty href\n"); @@ -132,6 +160,7 @@ static HRESULT navigate_anchor(HTMLAnchorElement *This) } } nsAString_Finish(&href_str); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return hres; } diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 65db2b2..5b9982c 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -362,9 +362,9 @@ static HRESULT WINAPI HTMLFormElement_get_onreset(IHTMLFormElement *iface, VARIA static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) { HTMLFormElement *This = impl_from_IHTMLFormElement(iface); - HTMLOuterWindow *window = NULL; + HTMLOuterWindow *window = NULL, *this_window = NULL; nsIInputStream *post_stream; - nsAString action_uri_str; + nsAString action_uri_str, target_str; IUri *uri; nsresult nsres; HRESULT hres; @@ -374,19 +374,32 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) if(This->element.node.doc) { HTMLDocumentNode *doc = This->element.node.doc; if(doc->window && doc->window->base.outer_window) - window = doc->window->base.outer_window; + this_window = doc->window->base.outer_window; } - if(!window) { + if(!this_window) { TRACE("No outer window\n"); return S_OK; } + nsAString_Init(&target_str, NULL); + nsres = nsIDOMHTMLFormElement_GetTarget(This->nsform, &target_str); + if(NS_SUCCEEDED(nsres)) { + BOOL use_new_window; + window = get_target_window(this_window, &target_str, &use_new_window); + if(use_new_window) + FIXME("submit to new window is not supported\n"); + } + nsAString_Finish(&target_str); + if(!window) + return S_OK; + /* * FIXME: We currently don't use our submit implementation for sub-windows because * load_nsuri can't support post data. We should fix it. */ if(!window->doc_obj || window->doc_obj->basedoc.window != window) { nsres = nsIDOMHTMLFormElement_Submit(This->nsform); + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(NS_FAILED(nsres)) { ERR("Submit failed: %08x\n", nsres); return E_FAIL; @@ -414,6 +427,7 @@ static HRESULT WINAPI HTMLFormElement_submit(IHTMLFormElement *iface) IUri_Release(uri); } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); if(post_stream) nsIInputStream_Release(post_stream); return hres; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5907ec1..882f859 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -943,6 +943,7 @@ HTMLElement *unsafe_impl_from_IHTMLElement(IHTMLElement*) DECLSPEC_HIDDEN; HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN; HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; +HTMLOuterWindow *get_target_window(HTMLOuterWindow*,nsAString*,BOOL*) DECLSPEC_HIDDEN; HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN;

1 0