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

Jacek Caban : jscript: Keep track of active call in a separated structure.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 8a17cf89fb0c78888855afd20cc2ebf05a1a351e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a17cf89fb0c78888855afd20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:02:35 2016 +0100 jscript: Keep track of active call in a separated structure. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 40 ++++++++++++++++++++++++++++++++-------- dlls/jscript/engine.h | 5 +++++ dlls/jscript/global.c | 4 ++-- dlls/jscript/jscript.h | 2 +- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 214d8fe..8d42962 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -511,8 +511,8 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re TRACE("%s\n", debugstr_w(identifier)); - if(ctx->exec_ctx) { - for(scope = ctx->exec_ctx->scope_chain; scope; scope = scope->next) { + if(ctx->call_ctx) { + for(scope = ctx->call_ctx->exec_ctx->scope_chain; scope; scope = scope->next) { if(scope->jsobj) hres = jsdisp_get_id(scope->jsobj, identifier, fdexNameImplicit, &id); else @@ -2393,6 +2393,11 @@ OP_LIST #undef X }; +static void release_call_frame(call_frame_t *frame) +{ + heap_free(frame); +} + static HRESULT unwind_exception(exec_ctx_t *ctx) { except_frame_t *except_frame; @@ -2446,17 +2451,19 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { - exec_ctx_t *exec_ctx = ctx->exec_ctx; + exec_ctx_t *exec_ctx = ctx->call_ctx->exec_ctx; except_frame_t *prev_except_frame; function_code_t *prev_func; unsigned prev_ip, prev_top; scope_chain_t *prev_scope; bytecode_t *prev_code; + call_frame_t *frame; jsop_t op; HRESULT hres = S_OK; TRACE("\n"); + frame = ctx->call_ctx; prev_top = exec_ctx->top; prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; @@ -2490,6 +2497,10 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code exec_ctx->code = prev_code; exec_ctx->func_code = prev_func; + assert(ctx->call_ctx == frame); + ctx->call_ctx = frame->prev_frame; + release_call_frame(frame); + if(FAILED(hres)) { while(exec_ctx->scope_chain != prev_scope) scope_pop(&exec_ctx->scope_chain); @@ -2543,9 +2554,23 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } +static HRESULT setup_call_frame(exec_ctx_t *ctx) +{ + call_frame_t *frame; + + frame = heap_alloc_zero(sizeof(*frame)); + if(!frame) + return E_OUTOFMEMORY; + + frame->exec_ctx = ctx; + + frame->prev_frame = ctx->script->call_ctx; + ctx->script->call_ctx = frame; + return S_OK; +} + HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { - exec_ctx_t *prev_ctx; jsval_t val; unsigned i; HRESULT hres = S_OK; @@ -2579,12 +2604,11 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, js } } - prev_ctx = ctx->script->exec_ctx; - ctx->script->exec_ctx = ctx; + hres = setup_call_frame(ctx); + if(FAILED(hres)) + return hres; hres = enter_bytecode(ctx->script, code, func, &val); - assert(ctx->script->exec_ctx == ctx); - ctx->script->exec_ctx = prev_ctx; if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 3943c9a..81316f7 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -190,6 +190,11 @@ static inline void scope_addref(scope_chain_t *scope) typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; +typedef struct _call_frame_t { + struct _call_frame_t *prev_frame; + exec_ctx_t *exec_ctx; +} call_frame_t; + struct _exec_ctx_t { LONG ref; diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 0755844..763868f 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -206,7 +206,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return S_OK; } - if(!ctx->exec_ctx) { + if(!ctx->call_ctx) { FIXME("No active exec_ctx\n"); return E_UNEXPECTED; } @@ -222,7 +222,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->exec_ctx, code, &code->global_code, r); + hres = exec_source(ctx->call_ctx->exec_ctx, code, &code->global_code, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 87f2e94..18be0c1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -385,7 +385,7 @@ struct _script_ctx_t { SCRIPTSTATE state; IActiveScript *active_script; - exec_ctx_t *exec_ctx; + struct _call_frame_t *call_ctx; named_item_t *named_items; IActiveScriptSite *site; IInternetHostSecurityManager *secmgr;

1 0

Alexandre Julliard : makefiles: Build import libraries that contain object files as static libraries.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 27528e54980d2742ff9b32ce2dbd5f8b73ba63b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27528e54980d2742ff9b32ce2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 15:31:54 2016 +0900 makefiles: Build import libraries that contain object files as static libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 25 +++++++------------------ configure | 27 +++++++-------------------- configure.ac | 2 -- tools/makedep.c | 24 +++++------------------- 4 files changed, 19 insertions(+), 59 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 41eb7f6..c65ebc4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -395,29 +395,18 @@ $ac_dir/uninstall:: if wine_fn_has_flag staticimplib then wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT -$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.$STATIC_IMPLIBEXT: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT +"__builddeps__: $ac_file.a +$ac_file.a $ac_file.cross.a: $ac_deps +$ac_file.a: dummy + @cd $ac_dir && \$(MAKE) lib$ac_implib.a .PHONY: $ac_dir/install-dev $ac_dir/uninstall -$ac_dir/install-dev:: $ac_file.$IMPLIBEXT - \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/install-dev:: $ac_file.a + \$(INSTALL_DATA) $ac_file.a \$(DESTDIR)\$(dlldir)/lib$ac_implib.a $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.a install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" - then - wine_fn_append_rule \ -"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT __builddeps__ - \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" - fi - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ diff --git a/configure b/configure index 76a6267..4d39f05 100755 --- a/configure +++ b/configure @@ -7184,7 +7184,6 @@ LDEXECFLAGS="" LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" -STATIC_IMPLIBEXT="def.a" # Extract the first word of "ldd", so it can be a program name with args. set dummy ldd; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -7622,29 +7621,18 @@ fi if wine_fn_has_flag staticimplib then wine_fn_append_rule \ -"__builddeps__: $ac_file.$IMPLIBEXT $ac_file.$STATIC_IMPLIBEXT -$ac_file.$STATIC_IMPLIBEXT $ac_file.cross.a: $ac_deps -$ac_file.def: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) - \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export $srcdir/$ac_dir/$ac_name.spec -$ac_file.$STATIC_IMPLIBEXT: dummy - @cd $ac_dir && \$(MAKE) lib$ac_implib.$STATIC_IMPLIBEXT +"__builddeps__: $ac_file.a +$ac_file.a $ac_file.cross.a: $ac_deps +$ac_file.a: dummy + @cd $ac_dir && \$(MAKE) lib$ac_implib.a .PHONY: $ac_dir/install-dev $ac_dir/uninstall -$ac_dir/install-dev:: $ac_file.$IMPLIBEXT - \$(INSTALL_DATA) $ac_file.$IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT +$ac_dir/install-dev:: $ac_file.a + \$(INSTALL_DATA) $ac_file.a \$(DESTDIR)\$(dlldir)/lib$ac_implib.a $ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$IMPLIBEXT + \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.a install install-dev:: $ac_dir/install-dev __uninstall__: $ac_dir/uninstall" - if test "$IMPLIBEXT" != "$STATIC_IMPLIBEXT" - then - wine_fn_append_rule \ -"$ac_dir/install-dev:: $ac_file.$STATIC_IMPLIBEXT __builddeps__ - \$(INSTALL_DATA) $ac_file.$STATIC_IMPLIBEXT \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT -$ac_dir/uninstall:: - \$(RM) \$(DESTDIR)\$(dlldir)/lib$ac_implib.$STATIC_IMPLIBEXT" - fi - if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then wine_fn_append_rule \ @@ -7921,7 +7909,6 @@ fi LIBEXT="dll" DLLEXT="" IMPLIBEXT="a" - STATIC_IMPLIBEXT="a" enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} enable_msvcrt=${enable_msvcrt:-no} diff --git a/configure.ac b/configure.ac index 8c22a4f..ddb28fa 100644 --- a/configure.ac +++ b/configure.ac @@ -676,7 +676,6 @@ AC_SUBST(LDEXECFLAGS,"") LIBEXT="so" DLLEXT=".so" IMPLIBEXT="def" -STATIC_IMPLIBEXT="def.a" WINE_PATH_SONAME_TOOLS WINE_CONFIG_HELPERS @@ -691,7 +690,6 @@ case $host_os in LIBEXT="dll" DLLEXT="" IMPLIBEXT="a" - STATIC_IMPLIBEXT="a" dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} enable_kernel32=${enable_kernel32:-no} diff --git a/tools/makedep.c b/tools/makedep.c index 9ee316c..7f81208 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1810,7 +1810,7 @@ static void add_generated_sources( struct makefile *make ) if (source->file->flags & FLAG_C_IMPLIB) { if (!make->staticimplib && make->importlib && *dll_ext) - make->staticimplib = strmake( "lib%s.def.a", make->importlib ); + make->staticimplib = strmake( "lib%s.a", make->importlib ); } if (strendswith( source->name, ".po" )) { @@ -2004,9 +2004,10 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *dir = top_obj_dir_path( make, submake->base_dir ); const char *ext = cross ? "cross.a" : *dll_ext ? "def" : "a"; - strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext )); if (!cross && submake->staticimplib) - strarray_add( deps, strmake( "%s/%s", dir, submake->staticimplib )); + lib = base_dir_path( submake, submake->staticimplib ); + else + strarray_add( deps, strmake( "%s/lib%s.%s", dir, name, ext )); break; } @@ -2704,7 +2705,7 @@ static struct strarray output_sources( const struct makefile *make ) if (spec_file && make->importlib) { char *importlib_path = obj_dir_path( make, strmake( "lib%s", make->importlib )); - if (*dll_ext) + if (*dll_ext && !implib_objs.count) { strarray_add( &clean_files, strmake( "lib%s.def", make->importlib )); output( "%s.def: %s %s\n", importlib_path, tools_path( make, "winebuild" ), spec_file ); @@ -2715,21 +2716,6 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->importlib, strmake( "lib%s.def", make->importlib ), strmake( "d$(dlldir)/lib%s.def", make->importlib )); - if (implib_objs.count) - { - strarray_add( &clean_files, strmake( "lib%s.def.a", make->importlib )); - output( "%s.def.a:", importlib_path ); - output_filenames_obj_dir( make, implib_objs ); - output( "\n" ); - output( "\trm -f $@\n" ); - output( "\t$(AR) $(ARFLAGS) $@" ); - output_filenames_obj_dir( make, implib_objs ); - output( "\n" ); - output( "\t$(RANLIB) $@\n" ); - add_install_rule( make, install_rules, make->importlib, - strmake( "lib%s.def.a", make->importlib ), - strmake( "d$(dlldir)/lib%s.def.a", make->importlib )); - } } else {

1 0

Alexandre Julliard : winebuild: Add support for linking to static import libraries.
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 13fe69714bbf719d9ddbcf8d34d025f48da3af7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=13fe69714bbf719d9ddbcf8d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 15:33:35 2016 +0900 winebuild: Add support for linking to static import libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d2d6f57..4fbcab0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -309,6 +309,28 @@ void add_extra_ld_symbol( const char *name ) strarray_add( &extra_ld_symbols, name, NULL ); } +/* retrieve an imported dll, adding one if necessary */ +struct import *add_static_import_dll( const char *name ) +{ + struct import *import; + char *dll_name = get_dll_name( name, NULL ); + + if ((import = find_import_dll( dll_name ))) return import; + + import = xmalloc( sizeof(*import) ); + memset( import, 0, sizeof(*import) ); + + import->dll_name = dll_name; + import->full_name = xstrdup( dll_name ); + import->c_name = make_c_identifier( dll_name ); + + if (is_delayed_import( dll_name )) + list_add_tail( &dll_delayed, &import->entry ); + else + list_add_tail( &dll_imports, &import->entry ); + return import; +} + /* add a function to the list of imports from a given dll */ static void add_import_func( struct import *imp, const char *name, const char *export_name, int ordinal ) { @@ -324,6 +346,26 @@ static void add_import_func( struct import *imp, const char *name, const char *e imp->nb_imports++; } +/* add an import for an undefined function of the form __wine$func$ */ +static void add_undef_import( const char *name, int is_ordinal ) +{ + char *p, *dll_name = xstrdup( name ); + int ordinal = 0; + struct import *import; + + if (!(p = strchr( dll_name, '$' ))) return; + *p++ = 0; + while (*p >= '0' && *p <= '9') ordinal = 10 * ordinal + *p++ - '0'; + if (*p != '$') return; + p++; + + import = add_static_import_dll( dll_name ); + if (is_ordinal) + add_import_func( import, NULL, xstrdup( p ), ordinal ); + else + add_import_func( import, xstrdup( p ), NULL, ordinal ); +} + /* get the default entry point for a given spec file */ static const char *get_default_entry_point( const DLLSPEC *spec ) { @@ -351,7 +393,7 @@ static void add_extra_undef_symbols( DLLSPEC *spec ) if (!spec->init_func) spec->init_func = xstrdup( get_default_entry_point(spec) ); add_extra_ld_symbol( spec->init_func ); if (has_stubs( spec )) add_extra_ld_symbol( "__wine_spec_unimplemented_stub" ); - if (!list_empty( &dll_delayed )) add_extra_ld_symbol( "__wine_spec_delay_load" ); + if (delayed_imports.count) add_extra_ld_symbol( "__wine_spec_delay_load" ); } /* check if a given imported dll is not needed, taking forwards into account */ @@ -518,7 +560,11 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) while (*p == ' ') p++; if (p[0] == 'U' && p[1] == ' ' && p[2]) p += 2; if (prefix_len && !strncmp( p, name_prefix, prefix_len )) p += prefix_len; - strarray_add( &undef_symbols, xstrdup( p ), NULL ); + if (!strncmp( p, import_func_prefix, strlen(import_func_prefix) )) + add_undef_import( p + strlen( import_func_prefix ), 0 ); + else if (!strncmp( p, import_ord_prefix, strlen(import_ord_prefix) )) + add_undef_import( p + strlen( import_ord_prefix ), 1 ); + else strarray_add( &undef_symbols, xstrdup( p ), NULL ); } if ((err = pclose( f ))) warning( "%s failed with status %d\n", cmd, err ); free( cmd ); @@ -526,13 +572,13 @@ void read_undef_symbols( DLLSPEC *spec, char **argv ) void resolve_dll_imports( DLLSPEC *spec, struct list *list ) { - unsigned int j, removed; + unsigned int j; struct import *imp, *next; ORDDEF *odp; LIST_FOR_EACH_ENTRY_SAFE( imp, next, list, struct import, entry ) { - for (j = removed = 0; j < undef_symbols.count; j++) + for (j = 0; j < undef_symbols.count; j++) { odp = find_export( undef_symbols.str[j], imp->exports, imp->nb_exports ); if (odp) @@ -546,11 +592,10 @@ void resolve_dll_imports( DLLSPEC *spec, struct list *list ) add_import_func( imp, (odp->flags & FLAG_NONAME) ? NULL : odp->name, odp->export_name, odp->ordinal ); remove_name( &undef_symbols, j-- ); - removed++; } } } - if (!removed) + if (!imp->nb_imports) { /* the dll is not used, get rid of it */ if (check_unused( imp, spec ))

1 0

Henri Verbeet : wined3d: Get resource info from the texture in surface_copy_simple_location().
by Alexandre Julliard March 25, 2016

March 25, 2016

Module: wine Branch: master Commit: 484f5f1ec5caa8e38ee5e6f721a25c7afbc58f43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484f5f1ec5caa8e38ee5e6f72… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 24 18:24:27 2016 +0100 wined3d: Get resource info from the texture in surface_copy_simple_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f1c379..b4e667f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2956,7 +2956,7 @@ static DWORD resource_access_from_location(DWORD location) static void surface_copy_simple_location(struct wined3d_surface *surface, DWORD location) { - struct wined3d_device *device = surface->resource.device; + struct wined3d_device *device = surface->container->resource.device; struct wined3d_context *context; const struct wined3d_gl_info *gl_info; struct wined3d_bo_address dst, src;

1 0

Matteo Bruni : wined3d: Emulate luminance texture formats on core profile.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 565ef4f961a8ebec7bb3cf7bd8802f3c0902ec43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=565ef4f961a8ebec7bb3cf7bd… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:08 2016 +0100 wined3d: Emulate luminance texture formats on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 81 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=565ef4f961a8ebec7bb3c…

1 0

Nikolay Sivov : xmllite/writer: Make it possible to use WriteRaw() multiple times.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 4dcbf2b4b235384d860a3ebdd88f182a46dc5a6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcbf2b4b235384d860a3ebdd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 24 10:41:26 2016 +0300 xmllite/writer: Make it possible to use WriteRaw() multiple times. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 15 ++++++++++++++- dlls/xmllite/writer.c | 18 +++++++++++------- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7a958b3..b4d7102 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -863,6 +863,7 @@ static void test_WriteCData(void) static void test_WriteRaw(void) { static const WCHAR rawW[] = {'a','<',':',0}; + static const WCHAR aW[] = {'a',0}; IXmlWriter *writer; IStream *stream; HRESULT hr; @@ -884,6 +885,18 @@ static void test_WriteRaw(void) hr = IXmlWriter_WriteRaw(writer, rawW); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteComment(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteRaw(writer, rawW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, aW, NULL, aW); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Yes); ok(hr == WR_E_INVALIDACTION, "got 0x%08x\n", hr); @@ -899,7 +912,7 @@ static void test_WriteRaw(void) hr = IXmlWriter_Flush(writer); ok(hr == S_OK, "got 0x%08x\n", hr); - CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:"); + CHECK_OUTPUT(stream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>a<:a<:a<:<a>a</a>"); IXmlWriter_Release(writer); IStream_Release(stream); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 61190c6..65d0bcc 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -767,10 +767,13 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr case XmlWriterState_ElemStarted: writer_close_starttag(This); break; - case XmlWriterState_DocClosed: - return WR_E_INVALIDACTION; + case XmlWriterState_Ready: + case XmlWriterState_DocStarted: + case XmlWriterState_PIDocStarted: + break; default: - ; + This->state = XmlWriterState_DocClosed; + return WR_E_INVALIDACTION; } write_encoding_bom(This); @@ -1043,11 +1046,11 @@ static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR data) case XmlWriterState_PIDocStarted: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } write_output_buffer(This->output, data, -1); - This->state = XmlWriterState_DocClosed; return S_OK; } @@ -1086,6 +1089,7 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal case XmlWriterState_Ready: break; default: + This->state = XmlWriterState_DocClosed; return WR_E_INVALIDACTION; } @@ -1099,6 +1103,9 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); + if (!local_name) + return E_INVALIDARG; + switch (This->state) { case XmlWriterState_Initial: @@ -1109,9 +1116,6 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre ; } - if (!local_name) - return E_INVALIDARG; - /* close pending element */ if (This->starttagopen) write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW));

1 0

Matteo Bruni : d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: b2dcc1007a4bbcee2fd8016d75f749f5108bc4ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2dcc1007a4bbcee2fd8016d7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:12 2016 +0100 d3d10core/tests: Add a test for DXGI_FORMAT_A8_UNORM textures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ba6f22e..dd63a64 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3790,6 +3790,13 @@ static void test_texture(void) 0xffb1c4de, 0xfff0f1f2, 0xfffafdfe, 0xff5a560f, 0xffd5ff00, 0xffc8f99f, 0xffaa00aa, 0xffdd55bb, }; + static const BYTE a8_data[] = + { + 0x00, 0x10, 0x20, 0x30, + 0x40, 0x50, 0x60, 0x70, + 0x80, 0x90, 0xa0, 0xb0, + 0xc0, 0xd0, 0xe0, 0xf0, + }; static const BYTE bc1_data[] = { 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, @@ -3836,6 +3843,8 @@ static void test_texture(void) }; static const struct texture srgb_texture = {4, 4, 1, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, {{srgb_data, 4 * sizeof(*srgb_data)}}}; + static const struct texture a8_texture = {4, 4, 1, DXGI_FORMAT_A8_UNORM, + {{a8_data, 4 * sizeof(*a8_data)}}}; static const struct texture bc1_texture = {8, 8, 1, DXGI_FORMAT_BC1_UNORM, {{bc1_data, 2 * 8}}}; static const struct texture bc2_texture = {8, 8, 1, DXGI_FORMAT_BC2_UNORM, {{bc2_data, 2 * 16}}}; static const struct texture bc3_texture = {8, 8, 1, DXGI_FORMAT_BC3_UNORM, {{bc3_data, 2 * 16}}}; @@ -3876,6 +3885,13 @@ static void test_texture(void) 0xff708cba, 0xffdee0e2, 0xfff3fbfd, 0xff1a1801, 0xffa9ff00, 0xff93f159, 0xff670067, 0xffb8177f, }; + static const DWORD a8_colors[] = + { + 0x00000000, 0x10000000, 0x20000000, 0x30000000, + 0x40000000, 0x50000000, 0x60000000, 0x70000000, + 0x80000000, 0x90000000, 0xa0000000, 0xb0000000, + 0xc0000000, 0xd0000000, 0xe0000000, 0xf0000000, + }; static const DWORD bc_colors[] = { 0xff0000ff, 0xff0000ff, 0xff00ff00, 0xff00ff00, @@ -3948,6 +3964,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, srgb_colors}, + {&ps_sample, &a8_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, 0.0f, 0.0f, a8_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D10_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, D3D10_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D10_FLOAT32_MAX, 8.0f, level_1_colors}, @@ -4101,9 +4118,9 @@ static void test_texture(void) draw_quad(&test_context); get_texture_readback(test_context.backbuffer, &rb); - for (x = 0; x < 4; ++x) + for (y = 0; y < 4; ++y) { - for (y = 0; y < 4; ++y) + for (x = 0; x < 4; ++x) { color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); ok(compare_color(color, test->expected_colors[y * 4 + x], 1),

1 0

Jacek Caban : jscript: Added a few more arguments tests.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 47cf3fe36d4f5a2f83c0d48ee763c256cd6010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47cf3fe36d4f5a2f83c0d48ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 16:39:23 2016 +0100 jscript: Added a few more arguments tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 3e60aba..5b1b510 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -194,6 +194,20 @@ ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.argu testRecFunc(true); ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); +function argumentsTest() { + var save = arguments; + with({arguments: 1}) { + ok(arguments === 1, "arguments = " + arguments); + (function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + })(); + } + eval('ok(arguments === save, "unexpected arguments");'); + [1,2].sort(function() { + ok(argumentsTest.arguments === save, "unexpected argumentsTest.arguments"); + }); +} + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Jacek Caban : jscript: Removed no longer used argument from exec_source.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 061592a205b031b41aca7404e54f87965ef72d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061592a205b031b41aca7404e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 24 14:28:08 2016 +0100 jscript: Removed no longer used argument from exec_source. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 2 +- dlls/jscript/engine.h | 2 +- dlls/jscript/function.c | 2 +- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 687b06c..214d8fe 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2543,7 +2543,7 @@ static HRESULT bind_event_target(script_ctx_t *ctx, function_code_t *func, jsdis return hres; } -HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, BOOL from_eval, jsval_t *ret) +HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) { exec_ctx_t *prev_ctx; jsval_t val; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dd8ed4c..3943c9a 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -218,5 +218,5 @@ static inline void exec_addref(exec_ctx_t *ctx) void exec_release(exec_ctx_t*) DECLSPEC_HIDDEN; HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**) DECLSPEC_HIDDEN; -HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,BOOL,jsval_t*) DECLSPEC_HIDDEN; +HRESULT exec_source(exec_ctx_t*,bytecode_t*,function_code_t*,jsval_t*) DECLSPEC_HIDDEN; HRESULT create_source_function(script_ctx_t*,bytecode_t*,function_code_t*,scope_chain_t*,jsdisp_t**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index dcddf59..0d30fdb 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -247,7 +247,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->code, function->func_code, FALSE, r); + hres = exec_source(exec_ctx, function->code, function->func_code, r); function->arguments = prev_args; exec_release(exec_ctx); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 03a26302..0755844 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -222,7 +222,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return throw_syntax_error(ctx, hres, NULL); } - hres = exec_source(ctx->exec_ctx, code, &code->global_code, TRUE, r); + hres = exec_source(ctx->exec_ctx, code, &code->global_code, r); release_bytecode(code); return hres; } diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 9519479..b1d4472 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -110,7 +110,7 @@ static HRESULT exec_global_code(JScript *This, bytecode_t *code) IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, FALSE, NULL); + hres = exec_source(exec_ctx, code, &code->global_code, NULL); exec_release(exec_ctx); IActiveScriptSite_OnLeaveScript(This->site); @@ -781,7 +781,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, IActiveScriptSite_OnEnterScript(This->site); clear_ei(This->ctx); - hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + hres = exec_source(exec_ctx, code, &code->global_code, &r); if(SUCCEEDED(hres)) { if(pvarResult) hres = jsval_to_variant(r, pvarResult);

1 0

Paul Gofman : d3d9/tests: Add test for D3DFMT_L8 format as render target.
by Alexandre Julliard March 24, 2016

March 24, 2016

Module: wine Branch: master Commit: 1d94ec8581e1c7bda66cc1e6c4d8cd88f9854651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d94ec8581e1c7bda66cc1e6c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Mar 23 19:39:59 2016 +0300 d3d9/tests: Add test for D3DFMT_L8 format as render target. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f531dc5..0d7e987 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11272,13 +11272,14 @@ static void pixelshader_blending_test(void) } test_formats[] = { - {"D3DFMT_G16R16", D3DFMT_G16R16, 0x001818ff, 0x002010ff}, + {"D3DFMT_G16R16", D3DFMT_G16R16, 0x001820ff, 0x002010ff}, {"D3DFMT_R16F", D3DFMT_R16F, 0x0018ffff, 0x0020ffff}, - {"D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001818ff, 0x002010ff}, - {"D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00181800, 0x00201000}, + {"D3DFMT_G16R16F", D3DFMT_G16R16F, 0x001820ff, 0x002010ff}, + {"D3DFMT_A16B16G16R16F", D3DFMT_A16B16G16R16F, 0x00182000, 0x00201000}, {"D3DFMT_R32F", D3DFMT_R32F, 0x0018ffff, 0x0020ffff}, - {"D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001818ff, 0x002010ff}, - {"D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00181800, 0x00201000}, + {"D3DFMT_G32R32F", D3DFMT_G32R32F, 0x001820ff, 0x002010ff}, + {"D3DFMT_A32B32G32R32F", D3DFMT_A32B32G32R32F, 0x00182000, 0x00201000}, + {"D3DFMT_L8", D3DFMT_L8, 0x00181818, 0x00202020}, }; static const float quad[][5] = { @@ -11292,15 +11293,13 @@ static void pixelshader_blending_test(void) struct vec3 position; DWORD diffuse; } - /* Quad with R=0x10, G=0x20 */ quad1[] = { - {{-1.0f, -1.0f, 0.1f}, 0x80102000}, - {{-1.0f, 1.0f, 0.1f}, 0x80102000}, - {{ 1.0f, -1.0f, 0.1f}, 0x80102000}, - {{ 1.0f, 1.0f, 0.1f}, 0x80102000}, + {{-1.0f, -1.0f, 0.1f}, 0x80103000}, + {{-1.0f, 1.0f, 0.1f}, 0x80103000}, + {{ 1.0f, -1.0f, 0.1f}, 0x80103000}, + {{ 1.0f, 1.0f, 0.1f}, 0x80103000}, }, - /* Quad with R=0x20, G=0x10 */ quad2[] = { {{-1.0f, -1.0f, 0.1f}, 0x80201000},

1 0