March 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Use the texture dimension helpers in prepare_ds_clear().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 8ade2418ef467552436700afeda7511d1257107b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ade2418ef467552436700afe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:17 2016 +0200 wined3d: Use the texture dimension helpers in prepare_ds_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 033bb58..395bbee 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -241,7 +241,9 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context { /* Depth buffer was discarded, make it entirely current in its new location since * there is no other place where we would get data anyway. */ - SetRect(out_rect, 0, 0, ds->resource.width, ds->resource.height); + SetRect(out_rect, 0, 0, + wined3d_texture_get_level_width(ds->container, ds->texture_level), + wined3d_texture_get_level_height(ds->container, ds->texture_level)); return; }

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_device_update_texture_3d().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 2f0a12149e1cb32fff655ba8b2dd85ebca40ffb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0a12149e1cb32fff655ba8b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 30 21:30:18 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_device_update_texture_3d(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 395bbee..debb1d5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3547,9 +3547,9 @@ static HRESULT wined3d_device_update_texture_3d(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->sub_resources[src_level].resource->width != dst_texture->resource.width - || src_texture->sub_resources[src_level].resource->height != dst_texture->resource.height - || src_texture->sub_resources[src_level].resource->depth != dst_texture->resource.depth) + if (wined3d_texture_get_level_width(src_texture, src_level) != dst_texture->resource.width + || wined3d_texture_get_level_height(src_texture, src_level) != dst_texture->resource.height + || wined3d_texture_get_level_depth(src_texture, src_level) != dst_texture->resource.depth) { WARN("Source and destination dimensions do not match.\n"); return WINED3DERR_INVALIDCALL;

1 0

Stefan Dösinger : wined3d: Introduce wined3d_texture_invalidate_location().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 984934f685d8d9d85d0be2fd4b96afd260718b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=984934f685d8d9d85d0be2fd4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 30 21:30:19 2016 +0200 wined3d: Introduce wined3d_texture_invalidate_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 4 +-- dlls/wined3d/device.c | 19 +++++++++----- dlls/wined3d/drawprim.c | 3 ++- dlls/wined3d/surface.c | 39 +++++++++------------------ dlls/wined3d/swapchain.c | 33 ++++++++++++----------- dlls/wined3d/texture.c | 55 +++++++++++++++++++++------------------ dlls/wined3d/volume.c | 23 ++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 9 files changed, 84 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=984934f685d8d9d85d0be…

1 0

Alexandre Julliard : winegcc: Support building from the top directory.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 2b525db8a29080b650f57647a8839ee0b5c959f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b525db8a29080b650f57647a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:34:46 2016 +0900 winegcc: Support building from the top directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1ddafc6..119e12b 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1464,6 +1464,11 @@ int main(int argc, char **argv) /* don't pass it to the compiler, this generates warnings */ raw_compiler_arg = raw_linker_arg = 0; } + else if (!strcmp(str, "tools/winebuild")) + { + opts.wine_objdir = "."; + raw_compiler_arg = raw_linker_arg = 0; + } if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break;

1 0

Alexandre Julliard : makedep: Rename top_dir_path to top_src_dir_path for consistency.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 5bec183195fdba3752de4bf0fb433ac97a662b4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bec183195fdba3752de4bf0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 31 14:39:32 2016 +0900 makedep: Rename top_dir_path to top_src_dir_path for consistency. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 2a9782a..47efda3 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -654,9 +654,9 @@ static char *top_obj_dir_path( const struct makefile *make, const char *path ) /******************************************************************* - * top_dir_path + * top_src_dir_path */ -static char *top_dir_path( const struct makefile *make, const char *path ) +static char *top_src_dir_path( const struct makefile *make, const char *path ) { if (make->top_src_dir) return concat_paths( make->top_src_dir, path ); return top_obj_dir_path( make, path ); @@ -1296,7 +1296,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p char *src_path = root_dir_path( path ); struct file *ret = load_file( src_path ); - if (ret) *filename = top_dir_path( make, path ); + if (ret) *filename = top_src_dir_path( make, path ); free( src_path ); return ret; } @@ -2147,7 +2147,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct output_filenames_obj_dir( make, targets ); output( "\n" ); - install_sh = top_dir_path( make, "tools/install-sh" ); + install_sh = top_src_dir_path( make, "tools/install-sh" ); for (i = 0; i < files.count; i += 2) { const char *file = files.str[i]; @@ -2318,8 +2318,10 @@ static struct strarray output_sources( const struct makefile *make ) if (make->src_dir) strarray_add( &includes, strmake( "-I%s", make->src_dir )); if (make->parent_dir) strarray_add( &includes, strmake( "-I%s", src_dir_path( make, make->parent_dir ))); strarray_add( &includes, strmake( "-I%s", top_obj_dir_path( make, "include" ))); - if (make->top_src_dir) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include" ))); - if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); + if (make->top_src_dir) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include" ))); + if (make->use_msvcrt) + strarray_add( &includes, strmake( "-I%s", top_src_dir_path( make, "include/msvcrt" ))); for (i = 0; i < make->include_paths.count; i++) strarray_add( &includes, strmake( "-I%s", obj_dir_path( make, make->include_paths.str[i] ))); @@ -2527,7 +2529,7 @@ static struct strarray output_sources( const struct makefile *make ) { output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", - fontforge, top_dir_path( make, "fonts/genttf.ff" ), source->filename ); + fontforge, top_src_dir_path( make, "fonts/genttf.ff" ), source->filename ); if (!(source->file->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } if (source->file->flags & FLAG_INSTALL) @@ -2560,7 +2562,7 @@ static struct strarray output_sources( const struct makefile *make ) output( "%s.ico %s.bmp: %s\n", src_dir_path( make, obj ), src_dir_path( make, obj ), source->filename ); output( "\tCONVERT=\"%s\" ICOTOOL=\"%s\" RSVG=\"%s\" %s %s $@\n", convert, icotool, rsvg, - top_dir_path( make, "tools/buildimage" ), source->filename ); + top_src_dir_path( make, "tools/buildimage" ), source->filename ); } } else if (!strcmp( ext, "po" )) /* po file */ @@ -2633,8 +2635,9 @@ static struct strarray output_sources( const struct makefile *make ) strarray_add( &ok_files, strmake( "%s.ok", obj )); output( "%s.ok:\n", obj_dir_path( make, obj )); output( "\t%s $(RUNTESTFLAGS) -T %s -M %s -p %s%s %s && touch $@\n", - top_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), make->testdll, - replace_extension( make->testdll, ".dll", "_test.exe" ), dll_ext, obj ); + top_src_dir_path( make, "tools/runtest" ), top_obj_dir_path( make, "" ), + make->testdll, replace_extension( make->testdll, ".dll", "_test.exe" ), + dll_ext, obj ); } if (!strcmp( ext, "c" ) && !(source->file->flags & FLAG_GENERATED)) strarray_add( &c2man_files, source->filename ); @@ -2764,33 +2767,33 @@ static struct strarray output_sources( const struct makefile *make ) if (c2man_files.count) { output( "manpages::\n" ); - output( "\t%s -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s/man%s", top_obj_dir_path( make, "documentation" ), man_ext )); output_filenames( c2man_files ); output( "\n" ); output( "htmlpages::\n" ); - output( "\t%s -Th -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Th -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/html" ))); output_filenames( c2man_files ); output( "\n" ); output( "sgmlpages::\n" ); - output( "\t%s -Ts -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Ts -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide" ))); output_filenames( c2man_files ); output( "\n" ); output( "xmlpages::\n" ); - output( "\t%s -Tx -w %s", top_dir_path( make, "tools/c2man.pl" ), spec_file ); - output_filename( strmake( "-R%s", top_dir_path( make, "" ))); - output_filename( strmake( "-I%s", top_dir_path( make, "include" ))); + output( "\t%s -Tx -w %s", top_src_dir_path( make, "tools/c2man.pl" ), spec_file ); + output_filename( strmake( "-R%s", top_src_dir_path( make, "" ))); + output_filename( strmake( "-I%s", top_src_dir_path( make, "include" ))); output_filename( strmake( "-o %s", top_obj_dir_path( make, "documentation/api-guide-xml" ))); output_filenames( c2man_files ); @@ -3088,8 +3091,8 @@ static struct strarray output_sources( const struct makefile *make ) { const struct makefile *submake = make->submakes[i]; - strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( submake, - strmake ( "%s.in", output_makefile_name )))); + strarray_add( &makefile_deps, top_src_dir_path( make, base_dir_path( submake, + strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" )); if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); @@ -3415,7 +3418,7 @@ static void load_sources( struct makefile *make ) make->src_dir = concat_paths( make->top_src_dir, make->base_dir ); } strarray_set_value( &make->vars, "top_builddir", top_obj_dir_path( make, "" )); - strarray_set_value( &make->vars, "top_srcdir", top_dir_path( make, "" )); + strarray_set_value( &make->vars, "top_srcdir", top_src_dir_path( make, "" )); strarray_set_value( &make->vars, "srcdir", src_dir_path( make, "" )); make->parent_dir = get_expanded_make_variable( make, "PARENTSRC" );

1 0

Nikolay Sivov : t2embed: Implement TTGetEmbeddingType().
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 12fbfe838c2e6f41ead7445decc447b41921474a URL: http://source.winehq.org/git/wine.git/?a=commit;h=12fbfe838c2e6f41ead7445de… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 13:00:26 2016 +0300 t2embed: Implement TTGetEmbeddingType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 +- configure.ac | 3 +- dlls/t2embed/Makefile.in | 2 ++ dlls/t2embed/main.c | 28 +++++++++++++-- dlls/t2embed/tests/Makefile.in | 5 +++ dlls/t2embed/tests/t2embed.c | 82 ++++++++++++++++++++++++++++++++++++++++++ include/t2embapi.h | 4 +++ 7 files changed, 122 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 764ac45..c1abf1f 100755 --- a/configure +++ b/configure @@ -17969,7 +17969,8 @@ wine_fn_config_dll svrapi enable_svrapi wine_fn_config_dll sxs enable_sxs implib wine_fn_config_test dlls/sxs/tests sxs_test wine_fn_config_dll system.drv16 enable_win16 -wine_fn_config_dll t2embed enable_t2embed +wine_fn_config_dll t2embed enable_t2embed implib +wine_fn_config_test dlls/t2embed/tests t2embed_test wine_fn_config_dll tapi32 enable_tapi32 implib wine_fn_config_dll taskschd enable_taskschd clean wine_fn_config_test dlls/taskschd/tests taskschd_test diff --git a/configure.ac b/configure.ac index f63dd61..c89aa08 100644 --- a/configure.ac +++ b/configure.ac @@ -3266,7 +3266,8 @@ WINE_CONFIG_DLL(svrapi) WINE_CONFIG_DLL(sxs,,[implib]) WINE_CONFIG_TEST(dlls/sxs/tests) WINE_CONFIG_DLL(system.drv16,enable_win16) -WINE_CONFIG_DLL(t2embed) +WINE_CONFIG_DLL(t2embed,,[implib]) +WINE_CONFIG_TEST(dlls/t2embed/tests) WINE_CONFIG_DLL(tapi32,,[implib]) WINE_CONFIG_DLL(taskschd,,[clean]) WINE_CONFIG_TEST(dlls/taskschd/tests) diff --git a/dlls/t2embed/Makefile.in b/dlls/t2embed/Makefile.in index d123846..e585fe2 100644 --- a/dlls/t2embed/Makefile.in +++ b/dlls/t2embed/Makefile.in @@ -1,4 +1,6 @@ MODULE = t2embed.dll +IMPORTLIB = t2embed +IMPORTS = gdi32 C_SRCS = \ main.c diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index e1a880d..2794f0f 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "wingdi.h" #include "t2embapi.h" #include "wine/debug.h" @@ -73,9 +74,30 @@ LONG WINAPI TTEmbedFont(HDC hDC, ULONG ulFlags, ULONG ulCharSet, ULONG *pulPrivS LONG WINAPI TTGetEmbeddingType(HDC hDC, ULONG *status) { - FIXME("(%p %p) stub\n", hDC, status); - if (status) *status = EMBED_NOEMBEDDING; - return E_API_NOTIMPL; + OUTLINETEXTMETRICW otm; + + TRACE("(%p %p)\n", hDC, status); + + if (!hDC) + return E_HDCINVALID; + + otm.otmSize = sizeof(otm); + if (!GetOutlineTextMetricsW(hDC, otm.otmSize, &otm)) + return E_NOTATRUETYPEFONT; + + if (!status) + return E_PERMISSIONSINVALID; + + if (otm.otmfsType == LICENSE_INSTALLABLE) + *status = EMBED_INSTALLABLE; + else if (otm.otmfsType & LICENSE_NOEMBEDDING) + *status = EMBED_NOEMBEDDING; + else if (otm.otmfsType & LICENSE_PREVIEWPRINT) + *status = EMBED_PREVIEWPRINT; + else if (otm.otmfsType & LICENSE_EDITABLE) + *status = EMBED_EDITABLE; + + return E_NONE; } LONG WINAPI TTIsEmbeddingEnabled(HDC hDC, BOOL *enabled) diff --git a/dlls/t2embed/tests/Makefile.in b/dlls/t2embed/tests/Makefile.in new file mode 100644 index 0000000..f7a5809 --- /dev/null +++ b/dlls/t2embed/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = t2embed.dll +IMPORTS = gdi32 t2embed + +C_SRCS = \ + t2embed.c diff --git a/dlls/t2embed/tests/t2embed.c b/dlls/t2embed/tests/t2embed.c new file mode 100644 index 0000000..cdc2f49 --- /dev/null +++ b/dlls/t2embed/tests/t2embed.c @@ -0,0 +1,82 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * 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 <stdarg.h> + +#include "windef.h" +#include "wingdi.h" +#include "t2embapi.h" +#include "wine/test.h" + +static void test_TTGetEmbeddingType(void) +{ + HFONT hfont, old_font; + LOGFONTA logfont; + ULONG status; + LONG ret; + HDC hdc; + + ret = TTGetEmbeddingType(NULL, NULL); + ok(ret == E_HDCINVALID, "got %d\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(NULL, &status); + ok(ret == E_HDCINVALID, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType((HDC)0xdeadbeef, &status); + ok(ret == E_NOTATRUETYPEFONT || broken(ret == E_ERRORACCESSINGFONTDATA) /* xp, vista */, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + hdc = CreateCompatibleDC(0); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + + status = 0xdeadbeef; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NOTATRUETYPEFONT, "got %#x\n", ret); + ok(status == 0xdeadbeef, "got %u\n", status); + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = 12; + logfont.lfWeight = FW_NORMAL; + strcpy(logfont.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&logfont); + ok(hfont != NULL, "got %p\n", hfont); + + old_font = SelectObject(hdc, hfont); + + status = 0; + ret = TTGetEmbeddingType(hdc, &status); + ok(ret == E_NONE, "got %#x\n", ret); + ok(status != 0, "got %u\n", status); + + ret = TTGetEmbeddingType(hdc, NULL); + ok(ret == E_PERMISSIONSINVALID, "got %#x\n", ret); + + SelectObject(hdc, old_font); + DeleteObject(hfont); + DeleteDC(hdc); +} + +START_TEST(t2embed) +{ + test_TTGetEmbeddingType(); +} diff --git a/include/t2embapi.h b/include/t2embapi.h index 16d68f3..60fda64 100644 --- a/include/t2embapi.h +++ b/include/t2embapi.h @@ -39,6 +39,10 @@ extern "C" { /* Possible return values. */ #define E_NONE __MSABI_LONG(0x0000) #define E_API_NOTIMPL __MSABI_LONG(0x0001) +#define E_HDCINVALID __MSABI_LONG(0x0006) +#define E_NOTATRUETYPEFONT __MSABI_LONG(0x000a) +#define E_ERRORACCESSINGFONTDATA __MSABI_LONG(0x000c) +#define E_PERMISSIONSINVALID __MSABI_LONG(0x0117) typedef ULONG (WINAPIV * READEMBEDPROC)(void*,void*,ULONG); typedef ULONG (WINAPIV * WRITEEMBEDPROC)(void*,void*,ULONG);

1 0

Jacek Caban : mshtml: Moved createAttribute tests to test_attr.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 51304cbe720ec74a228fda2a963fb56a37e96770 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51304cbe720ec74a228fda2a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:26 2016 +0200 mshtml: Moved createAttribute tests to test_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 76 ++++++++++++++++++++++++++++--------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 4206e9c..f64bd82 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1903,6 +1903,22 @@ static void _test_comment_text(unsigned line, IUnknown *unk, const char *extext) SysFreeString(text); } +#define create_attr(a,b) _create_attr(__LINE__,a,b) +static IHTMLDOMAttribute *_create_attr(unsigned line, IUnknown *unk, const char *name) +{ + IHTMLDocument5 *doc = _get_htmldoc5_iface(line, unk); + BSTR str = a2bstr("Test"); + IHTMLDOMAttribute *attr; + HRESULT hres; + + hres = IHTMLDocument5_createAttribute(doc, str, &attr); + ok_(__FILE__,line)(hres == S_OK, "createAttribute dailed: %08x\n", hres); + SysFreeString(str); + IHTMLDocument5_Release(doc); + + return attr; +} + #define test_attr_specified(a,b) _test_attr_specified(__LINE__,a,b) static void _test_attr_specified(unsigned line, IHTMLDOMAttribute *attr, VARIANT_BOOL expected) { @@ -8493,7 +8509,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLWindow2_Release(window); } -static void test_attr(IHTMLElement *elem) +static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) { IHTMLDOMAttribute *attr, *attr2; VARIANT v; @@ -8575,6 +8591,31 @@ static void test_attr(IHTMLElement *elem) test_attr_specified(attr, VARIANT_FALSE); test_attr_expando(attr, VARIANT_FALSE); IHTMLDOMAttribute_Release(attr); + + /* Test created, detached attribute. */ + attr = create_attr((IUnknown*)doc, "Test"); + + test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); + test_ifaces((IUnknown*)attr, attr_iids); + test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); + + test_attr_node_name(attr, "Test"); + test_attr_expando(attr, VARIANT_FALSE); + + get_attr_node_value(attr, &v, VT_EMPTY); + + V_VT(&v) = VT_I4; + V_I4(&v) = 1; + put_attr_node_value(attr, v); + + get_attr_node_value(attr, &v, VT_I4); + ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + + V_VT(&v) = VT_EMPTY; + put_attr_node_value(attr, v); + get_attr_node_value(attr, &v, VT_EMPTY); + + IHTMLDOMAttribute_Release(attr); } static void test_blocked(IHTMLDocument2 *doc, IHTMLElement *outer_elem) @@ -8796,7 +8837,7 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } - test_attr(div); + test_attr(doc, div); test_blocked(doc, div); test_elem_names(doc); @@ -8807,7 +8848,6 @@ static void test_create_elems(IHTMLDocument2 *doc) { IHTMLElement *elem, *body, *elem2; IHTMLDOMNode *node, *node2, *node3, *comment; - IHTMLDOMAttribute *attr; IHTMLDocument5 *doc5; IDispatch *disp; VARIANT var; @@ -8911,36 +8951,6 @@ static void test_create_elems(IHTMLDocument2 *doc) IHTMLDOMNode_Release(comment); } - str = a2bstr("Test"); - hres = IHTMLDocument5_createAttribute(doc5, str, &attr); - ok(hres == S_OK, "createAttribute dailed: %08x\n", hres); - SysFreeString(str); - if(SUCCEEDED(hres)) { - VARIANT v; - - test_disp((IUnknown*)attr, &DIID_DispHTMLDOMAttribute, "[object]"); - test_ifaces((IUnknown*)attr, attr_iids); - test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); - - test_attr_node_name(attr, "Test"); - test_attr_expando(attr, VARIANT_FALSE); - - get_attr_node_value(attr, &v, VT_EMPTY); - - V_VT(&v) = VT_I4; - V_I4(&v) = 1; - put_attr_node_value(attr, v); - - get_attr_node_value(attr, &v, VT_I4); - ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); - - V_VT(&v) = VT_EMPTY; - put_attr_node_value(attr, v); - get_attr_node_value(attr, &v, VT_EMPTY); - - IHTMLDOMAttribute_Release(attr); - } - IHTMLDocument5_Release(doc5); }

1 0

Jacek Caban : mshtml: Split conversion to string out of get_elem_attr_value_by_dispid.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: a3ab8d679225562dc3eed427173c2966698c3529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ab8d679225562dc3eed4271… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:44 2016 +0200 mshtml: Split conversion to string out of get_elem_attr_value_by_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 6 +++-- dlls/mshtml/htmlelem.c | 61 ++++++++++++++++++++++++-------------------- dlls/mshtml/mshtml_private.h | 7 ++--- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 97a4ce2..8b21eea 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -169,7 +169,7 @@ static HRESULT WINAPI HTMLDOMAttribute_get_nodeValue(IHTMLDOMAttribute *iface, V if(!This->elem) return VariantCopy(p, &This->value); - return get_elem_attr_value_by_dispid(This->elem, This->dispid, 0, p); + return get_elem_attr_value_by_dispid(This->elem, This->dispid, p); } static HRESULT WINAPI HTMLDOMAttribute_get_specified(IHTMLDOMAttribute *iface, VARIANT_BOOL *p) @@ -315,7 +315,9 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST return E_UNEXPECTED; } - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, ATTRFLAG_ASSTRING, &val); + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + if(SUCCEEDED(hres)) + hres = attr_value_to_string(&val); if(FAILED(hres)) return hres; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb0b864..c7090e6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -63,6 +63,10 @@ static const WCHAR textareaW[] = {'T','E','X','T','A','R','E','A',0}; static const WCHAR title_tagW[]= {'T','I','T','L','E',0}; static const WCHAR trW[] = {'T','R',0}; +#define ATTRFLAG_CASESENSITIVE 0x0001 +#define ATTRFLAG_ASSTRING 0x0002 +#define ATTRFLAG_EXPANDURL 0x0004 + typedef struct { const WCHAR *name; HRESULT (*constructor)(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**); @@ -638,39 +642,39 @@ static HRESULT WINAPI HTMLElement_setAttribute(IHTMLElement *iface, BSTR strAttr LOCALE_SYSTEM_DEFAULT, DISPATCH_PROPERTYPUT, &dispParams, NULL, &excep, NULL); } -HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, DWORD flags, VARIANT *ret) +HRESULT get_elem_attr_value_by_dispid(HTMLElement *elem, DISPID dispid, VARIANT *ret) { DISPPARAMS dispParams = {NULL, NULL, 0, 0}; EXCEPINFO excep; + + return IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, + DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); +} + +HRESULT attr_value_to_string(VARIANT *v) +{ HRESULT hres; static const WCHAR nullW[] = {'n','u','l','l',0}; - hres = IDispatchEx_InvokeEx(&elem->node.event_target.dispex.IDispatchEx_iface, dispid, LOCALE_SYSTEM_DEFAULT, - DISPATCH_PROPERTYGET, &dispParams, ret, &excep, NULL); - if(FAILED(hres)) - return hres; - - if(flags & ATTRFLAG_ASSTRING) { - switch(V_VT(ret)) { - case VT_BSTR: - break; - case VT_NULL: - V_BSTR(ret) = SysAllocString(nullW); - if(!V_BSTR(ret)) - return E_OUTOFMEMORY; - V_VT(ret) = VT_BSTR; - break; - case VT_DISPATCH: - IDispatch_Release(V_DISPATCH(ret)); - V_VT(ret) = VT_BSTR; - V_BSTR(ret) = SysAllocString(NULL); - break; - default: - hres = VariantChangeType(ret, ret, 0, VT_BSTR); - if(FAILED(hres)) - return hres; - } + switch(V_VT(v)) { + case VT_BSTR: + break; + case VT_NULL: + V_BSTR(v) = SysAllocString(nullW); + if(!V_BSTR(v)) + return E_OUTOFMEMORY; + V_VT(v) = VT_BSTR; + break; + case VT_DISPATCH: + IDispatch_Release(V_DISPATCH(v)); + V_VT(v) = VT_BSTR; + V_BSTR(v) = SysAllocString(NULL); + break; + default: + hres = VariantChangeType(v, v, 0, VT_BSTR); + if(FAILED(hres)) + return hres; } return S_OK; @@ -700,7 +704,10 @@ static HRESULT WINAPI HTMLElement_getAttribute(IHTMLElement *iface, BSTR strAttr return hres; } - return get_elem_attr_value_by_dispid(This, dispid, lFlags, AttributeValue); + hres = get_elem_attr_value_by_dispid(This, dispid, AttributeValue); + if(SUCCEEDED(hres) && (lFlags & ATTRFLAG_ASSTRING)) + hres = attr_value_to_string(AttributeValue); + return hres; } static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strAttributeName, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36c95ce..611cb8b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1016,11 +1016,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode*,BOOL) DECLSPEC_HIDDEN IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode*,nsIDOMNodeList*) DECLSPEC_HIDDEN; IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode*,nsIDOMHTMLCollection*) DECLSPEC_HIDDEN; -#define ATTRFLAG_CASESENSITIVE 0x0001 -#define ATTRFLAG_ASSTRING 0x0002 -#define ATTRFLAG_EXPANDURL 0x0004 - -HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,DWORD,VARIANT*) DECLSPEC_HIDDEN; +HRESULT attr_value_to_string(VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_elem_attr_value_by_dispid(HTMLElement*,DISPID,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_source_index(HTMLElement*,LONG*) DECLSPEC_HIDDEN; nsresult get_elem_attr_value(nsIDOMHTMLElement*,const WCHAR*,nsAString*,const PRUnichar**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Added support for IHTMLDOMAttribute2:: get_value on detached attributes.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 7ad4aeb7352e302d4a9f7399caccaf92bb23f27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad4aeb7352e302d4a9f7399c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:38:58 2016 +0200 mshtml: Added support for IHTMLDOMAttribute2::get_value on detached attributes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 11 +++++------ dlls/mshtml/tests/dom.c | 7 +++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 8b21eea..bd7cb82 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -310,12 +310,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_value(IHTMLDOMAttribute2 *iface, BST TRACE("(%p)->(%p)\n", This, p); - if(!This->elem) { - FIXME("NULL This->elem\n"); - return E_UNEXPECTED; - } - - hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + V_VT(&val) = VT_EMPTY; + if(This->elem) + hres = get_elem_attr_value_by_dispid(This->elem, This->dispid, &val); + else + hres = VariantCopy(&val, &This->value); if(SUCCEEDED(hres)) hres = attr_value_to_string(&val); if(FAILED(hres)) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f64bd82..41dddab 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -8610,11 +8610,18 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) get_attr_node_value(attr, &v, VT_I4); ok(V_I4(&v) == 1, "nodeValue = %d\n", V_I4(&v)); + test_attr_value(attr, "1"); V_VT(&v) = VT_EMPTY; put_attr_node_value(attr, v); get_attr_node_value(attr, &v, VT_EMPTY); + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("testing"); + put_attr_node_value(attr, v); + SysFreeString(V_BSTR(&v)); + test_attr_value(attr, "testing"); + IHTMLDOMAttribute_Release(attr); }

1 0

Jacek Caban : mshtml: Added IHTMLDOMAttribute2:: get_parentNode implementation.
by Alexandre Julliard 30 Mar '16

30 Mar '16

Module: wine Branch: master Commit: 423b7ba1d174503038b66f9639fd9c1db3df1d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=423b7ba1d174503038b66f963… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 30 14:39:08 2016 +0200 mshtml: Added IHTMLDOMAttribute2::get_parentNode implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlattr.c | 7 +++++-- dlls/mshtml/tests/dom.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index bd7cb82..7a11245 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -347,8 +347,11 @@ static HRESULT WINAPI HTMLDOMAttribute2_get_nodeType(IHTMLDOMAttribute2 *iface, static HRESULT WINAPI HTMLDOMAttribute2_get_parentNode(IHTMLDOMAttribute2 *iface, IHTMLDOMNode **p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = NULL; + return S_OK; } static HRESULT WINAPI HTMLDOMAttribute2_get_childNodes(IHTMLDOMAttribute2 *iface, IDispatch **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 41dddab..6d6a1e8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3402,6 +3402,19 @@ static void _test_attr_node_name(unsigned line, IHTMLDOMAttribute *attr, const c SysFreeString(str); } +#define test_attr_parent(a) _test_attr_parent(__LINE__,a) +static void _test_attr_parent(unsigned line, IHTMLDOMAttribute *attr) +{ + IHTMLDOMAttribute2 *attr2 = _get_attr2_iface(line, (IUnknown*)attr); + IHTMLDOMNode *parent = (void*)0xdeadbeef; + HRESULT hres; + + hres = IHTMLDOMAttribute2_get_parentNode(attr2, &parent); + ok_(__FILE__,line)(hres == S_OK, "get_parentNode failed: %08x\n", hres); + ok_(__FILE__,line)(!parent, "parent != NULL\n"); + IHTMLDOMAttribute2_Release(attr2); +} + static void test_attr_collection_disp(IDispatch *disp) { IDispatchEx *dispex; @@ -8522,6 +8535,7 @@ static void test_attr(IHTMLDocument2 *doc, IHTMLElement *elem) test_ifaces((IUnknown*)attr, attr_iids); test_no_iface((IUnknown*)attr, &IID_IHTMLDOMNode); test_attr_specified(attr, VARIANT_TRUE); + test_attr_parent(attr); attr2 = get_elem_attr_node((IUnknown*)elem, "id", TRUE); ok(iface_cmp((IUnknown*)attr, (IUnknown*)attr2), "attr != attr2\n");

1 0