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

Alexandre Julliard : makefiles: Expand the names of static libraries in linker commands.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 255b90c64c5f64ba65a5101436ea62d5f1df966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=255b90c64c5f64ba65a510143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 25 15:19:53 2016 +0900 makefiles: Expand the names of static libraries in linker commands. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8cbba1b..9ee316c 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1926,16 +1926,17 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons /******************************************************************* - * has_static_lib + * get_static_lib * - * Check if makefile builds the named static library. + * Check if makefile builds the named static library and return the full lib path. */ -static int has_static_lib( const struct makefile *make, const char *name ) +static const char *get_static_lib( const struct makefile *make, const char *name ) { - if (!make->staticlib) return 0; - if (strncmp( make->staticlib, "lib", 3 )) return 0; - if (strncmp( make->staticlib + 3, name, strlen(name) )) return 0; - return !strcmp( make->staticlib + 3 + strlen(name), ".a" ); + if (!make->staticlib) return NULL; + if (strncmp( make->staticlib, "lib", 3 )) return NULL; + if (strncmp( make->staticlib + 3, name, strlen(name) )) return NULL; + if (strcmp( make->staticlib + 3 + strlen(name), ".a" )) return NULL; + return base_dir_path( make, make->staticlib ); } @@ -1954,7 +1955,8 @@ static struct strarray add_default_libraries( const struct makefile *make, struc for (i = 0; i < all_libs.count; i++) { - int found = 0; + const char *lib = NULL; + if (!strncmp( all_libs.str[i], "-l", 2 )) { const char *name = all_libs.str[i] + 2; @@ -1963,17 +1965,17 @@ static struct strarray add_default_libraries( const struct makefile *make, struc { const struct makefile *submake = top_makefile->submakes[j]; - if ((found = has_static_lib( submake, name ))) - { - const char *lib = strmake( "%s/lib%s.a", - top_obj_dir_path( make, submake->base_dir ), name ); - strarray_add( deps, lib ); - strarray_add( &ret, lib ); - break; - } + if ((lib = get_static_lib( submake, name ))) break; } } - if (!found) strarray_add( &ret, all_libs.str[i] ); + + if (lib) + { + lib = top_obj_dir_path( make, lib ); + strarray_add( deps, lib ); + strarray_add( &ret, lib ); + } + else strarray_add( &ret, all_libs.str[i] ); } return ret; } @@ -1991,6 +1993,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra for (i = 0; i < imports.count; i++) { const char *name = imports.str[i]; + const char *lib = NULL; for (j = 0; j < top_makefile->subdirs.count; j++) { @@ -2007,15 +2010,16 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra break; } - if (has_static_lib( submake, name )) - { - const char *dir = top_obj_dir_path( make, submake->base_dir ); + if ((lib = get_static_lib( submake, name ))) break; + } - strarray_add( deps, strmake( "%s/lib%s.a", dir, name )); - break; - } + if (lib) + { + lib = top_obj_dir_path( make, lib ); + strarray_add( deps, lib ); + strarray_add( &ret, lib ); } - strarray_add( &ret, strmake( "-l%s", name )); + else strarray_add( &ret, strmake( "-l%s", name )); } return ret; }

1 0

Alexandre Julliard : makefiles: Build import libraries that contain object files as static libraries.
by Alexandre Julliard 25 Mar '16

25 Mar '16

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

Jacek Caban : jscript: Keep track of active call in a separated structure.
by Alexandre Julliard 25 Mar '16

25 Mar '16

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

Jacek Caban : jscript: Store bytecode pointer in call_frame_t.
by Alexandre Julliard 25 Mar '16

25 Mar '16

Module: wine Branch: master Commit: 89ad1094ea5521c3b6ec505867bc4482de89adfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ad1094ea5521c3b6ec50586… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 25 12:02:48 2016 +0100 jscript: Store bytecode pointer in call_frame_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/engine.c | 27 ++++++++++++--------------- dlls/jscript/engine.h | 3 ++- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8d42962..8b0477f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -568,23 +568,23 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re } static inline BSTR get_op_bstr(exec_ctx_t *ctx, int i){ - return ctx->code->instrs[ctx->ip].u.arg[i].bstr; + return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].bstr; } static inline unsigned get_op_uint(exec_ctx_t *ctx, int i){ - return ctx->code->instrs[ctx->ip].u.arg[i].uint; + return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].uint; } static inline unsigned get_op_int(exec_ctx_t *ctx, int i){ - return ctx->code->instrs[ctx->ip].u.arg[i].lng; + return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].lng; } static inline jsstr_t *get_op_str(exec_ctx_t *ctx, int i){ - return ctx->code->instrs[ctx->ip].u.arg[i].str; + return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.arg[i].str; } static inline double get_op_double(exec_ctx_t *ctx){ - return ctx->code->instrs[ctx->ip].u.dbl; + return ctx->script->call_ctx->bytecode->instrs[ctx->ip].u.dbl; } /* ECMA-262 3rd Edition 12.2 */ @@ -830,7 +830,7 @@ static HRESULT interp_func(exec_ctx_t *ctx) TRACE("%d\n", func_idx); - hres = create_source_function(ctx->script, ctx->code, ctx->func_code->funcs+func_idx, + hres = create_source_function(ctx->script, ctx->script->call_ctx->bytecode, ctx->func_code->funcs+func_idx, ctx->scope_chain, &dispex); if(FAILED(hres)) return hres; @@ -2449,14 +2449,13 @@ static HRESULT unwind_exception(exec_ctx_t *ctx) return hres; } -static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code_t *func, jsval_t *ret) +static HRESULT enter_bytecode(script_ctx_t *ctx, function_code_t *func, jsval_t *ret) { 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; @@ -2468,15 +2467,13 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code prev_scope = exec_ctx->scope_chain; prev_except_frame = exec_ctx->except_frame; prev_ip = exec_ctx->ip; - prev_code = exec_ctx->code; prev_func = exec_ctx->func_code; exec_ctx->ip = func->instr_off; exec_ctx->except_frame = NULL; - exec_ctx->code = code; exec_ctx->func_code = func; while(exec_ctx->ip != -1) { - op = code->instrs[exec_ctx->ip].op; + op = frame->bytecode->instrs[exec_ctx->ip].op; hres = op_funcs[op](exec_ctx); if(FAILED(hres)) { TRACE("EXCEPTION %08x\n", hres); @@ -2494,7 +2491,6 @@ static HRESULT enter_bytecode(script_ctx_t *ctx, bytecode_t *code, function_code exec_ctx->ip = prev_ip; exec_ctx->except_frame = prev_except_frame; - exec_ctx->code = prev_code; exec_ctx->func_code = prev_func; assert(ctx->call_ctx == frame); @@ -2554,7 +2550,7 @@ 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) +static HRESULT setup_call_frame(exec_ctx_t *ctx, bytecode_t *bytecode) { call_frame_t *frame; @@ -2562,6 +2558,7 @@ static HRESULT setup_call_frame(exec_ctx_t *ctx) if(!frame) return E_OUTOFMEMORY; + frame->bytecode = bytecode; frame->exec_ctx = ctx; frame->prev_frame = ctx->script->call_ctx; @@ -2604,11 +2601,11 @@ HRESULT exec_source(exec_ctx_t *ctx, bytecode_t *code, function_code_t *func, js } } - hres = setup_call_frame(ctx); + hres = setup_call_frame(ctx, code); if(FAILED(hres)) return hres; - hres = enter_bytecode(ctx->script, code, func, &val); + hres = enter_bytecode(ctx->script, func, &val); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 81316f7..fc99c68 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -191,6 +191,8 @@ typedef struct _except_frame_t except_frame_t; struct _parser_ctx_t; typedef struct _call_frame_t { + bytecode_t *bytecode; + struct _call_frame_t *prev_frame; exec_ctx_t *exec_ctx; } call_frame_t; @@ -199,7 +201,6 @@ struct _exec_ctx_t { LONG ref; struct _parser_ctx_t *parser; - bytecode_t *code; script_ctx_t *script; scope_chain_t *scope_chain; jsdisp_t *var_disp;

1 0

Nikolay Sivov : user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 9d91fce444fab9dc408f1e3834b2b0738843ec41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d91fce444fab9dc408f1e383… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 21 17:36:13 2016 +0300 user32: For EnableScrollBar() always go through EnableWindow() in SB_CTL case. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 2 +- dlls/user32/tests/scroll.c | 26 ++++++++++++++++++++++++-- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index b28ee44..a210962 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -2039,7 +2039,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnableScrollBar( HWND hwnd, UINT nBar, UINT flags nBar = SB_HORZ; } else - bFineWithMe = TRUE; + bFineWithMe = nBar != SB_CTL; if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) return FALSE; if (bFineWithMe && infoPtr->flags == flags) return FALSE; diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 691855b..1c454fb 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -114,6 +114,15 @@ static void test_EnableScrollBar(void) ok( ret, "The scrollbar should be enabled.\n" ); ok( IsWindowEnabled( hScroll ), "The scrollbar window should be enabled.\n" ); + /* disable window, try to reenable */ + ret = EnableWindow( hScroll, FALSE ); + ok( !ret, "got %d\n", ret ); + ok( !IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + + ret = EnableScrollBar( hScroll, SB_CTL, ESB_ENABLE_BOTH ); + ok( ret, "got %d\n", ret ); + ok( IsWindowEnabled( hScroll ), "The scrollbar window should be disabled.\n" ); + DestroyWindow(hScroll); DestroyWindow(mainwnd); } @@ -539,7 +548,7 @@ static void test_SetScrollInfo(void) EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); @@ -551,9 +560,10 @@ static void test_SetScrollInfo(void) memset(&si, 0, sizeof(si)); si.cbSize = sizeof(si); ret = IsWindowEnabled(hScroll); - ok(!ret, "scroll bar disabled\n"); + ok(!ret, "scroll bar enabled\n"); si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.nMax = 100; + si.nMin = 10; si.nPos = 0; si.nPage = 100; SetScrollInfo(hScroll, SB_CTL, &si, TRUE); @@ -564,6 +574,18 @@ static void test_SetScrollInfo(void) ret = GetScrollInfo(hScroll, SB_CTL, &si); ok(ret, "got %d\n", ret); + EnableScrollBar(hScroll, SB_CTL, ESB_ENABLE_BOTH); + ok(IsWindowEnabled(hScroll), "expected enabled scrollbar\n"); + + si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; + si.nMax = 10; + si.nMin = 100; + si.nPos = 0; + si.nPage = 100; + SetScrollInfo(hScroll, SB_CTL, &si, TRUE); + ret = IsWindowEnabled(hScroll); + ok(ret, "scroll bar disabled\n"); + DestroyWindow(hScroll); DestroyWindow(mainwnd); }

1 0

Austin English : winscard: Add stubs for SCardListReadersA/W.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: c1614094f4c1e6cbde0f357b9dd910b64db9d4f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1614094f4c1e6cbde0f357b9… Author: Austin English <austinenglish(a)gmail.com> Date: Sun Mar 20 22:58:27 2016 -0500 winscard: Add stubs for SCardListReadersA/W. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winscard/winscard.c | 12 ++++++++++++ dlls/winscard/winscard.spec | 4 ++-- include/winscard.h | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index bcf8129..a8a1735 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -129,3 +129,15 @@ void WINAPI SCardReleaseStartedEvent(void) { FIXME("stub\n"); } + +LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} + +LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) +{ + FIXME("(%lx, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); + return SCARD_E_NO_READERS_AVAILABLE; +} diff --git a/dlls/winscard/winscard.spec b/dlls/winscard/winscard.spec index 8ecf988..5fd8903 100644 --- a/dlls/winscard/winscard.spec +++ b/dlls/winscard/winscard.spec @@ -40,8 +40,8 @@ @ stub SCardListInterfacesW @ stub SCardListReaderGroupsA @ stub SCardListReaderGroupsW -@ stub SCardListReadersA -@ stub SCardListReadersW +@ stdcall SCardListReadersA(long str ptr ptr) +@ stdcall SCardListReadersW(long wstr ptr ptr) @ stub SCardLocateCardsA @ stub SCardLocateCardsByATRA @ stub SCardLocateCardsByATRW diff --git a/include/winscard.h b/include/winscard.h index 884d350..fc729e2 100644 --- a/include/winscard.h +++ b/include/winscard.h @@ -120,8 +120,8 @@ LONG WINAPI SCardListCardsW(SCARDCONTEXT,LPCBYTE,LPCGUID,DWORD,LPWSTR,LPD LONG WINAPI SCardListInterfacesA(SCARDCONTEXT,LPCSTR,LPGUID,LPDWORD); LONG WINAPI SCardListInterfacesW(SCARDCONTEXT,LPCWSTR,LPGUID,LPDWORD); #define SCardListInterfaces WINELIB_NAME_AW(SCardListInterfaces) -LONG WINAPI SCardListReadersA(SCARDCONTEXT,LPCSTR,LPSTR,LPDWORD); -LONG WINAPI SCardListReadersW(SCARDCONTEXT,LPCWSTR,LPWSTR,LPDWORD); +LONG WINAPI SCardListReadersA(SCARDCONTEXT,const CHAR *,CHAR *,DWORD *); +LONG WINAPI SCardListReadersW(SCARDCONTEXT,const WCHAR *,WCHAR *,DWORD *); #define SCardListReaders WINELIB_NAME_AW(SCardListReaders) LONG WINAPI SCardListReaderGroupsA(SCARDCONTEXT,LPSTR,LPDWORD); LONG WINAPI SCardListReaderGroupsW(SCARDCONTEXT,LPWSTR,LPDWORD);

1 0

Matteo Bruni : wined3d: Use ARB_texture_swizzle for color fixups when possible.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 0ed39ad13db834525f35462f4c9deec1c61786aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ed39ad13db834525f35462f4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:10 2016 +0100 wined3d: Use ARB_texture_swizzle for color fixups when possible. 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/cs.c | 4 +++- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 5 ++++- dlls/wined3d/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/utils.c | 5 ++++- dlls/wined3d/wined3d_private.h | 6 ++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 910350d..0e6cc5b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -634,6 +634,7 @@ void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_sha static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { + const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_cs_set_texture *op = data; struct wined3d_texture *prev; @@ -653,7 +654,8 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) op->texture->sampler = op->stage; if (!prev || op->texture->target != prev->target - || !is_same_fixup(new_format->color_fixup, old_format->color_fixup) + || (!is_same_fixup(new_format->color_fixup, old_format->color_fixup) + && !(can_use_texture_swizzle(gl_info, new_format) && can_use_texture_swizzle(gl_info, old_format))) || (new_fmt_flags & WINED3DFMT_FLAG_SHADOW) != (old_fmt_flags & WINED3DFMT_FLAG_SHADOW)) device_invalidate_state(cs->device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8892d49..e6ef82a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2883,9 +2883,8 @@ static void PRINTF_ATTR(9, 10) shader_glsl_gen_sample_code(const struct wined3d_ shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); - /* FIXME: We currently don't support fixups for vertex shaders or anything - * above SM3. Note that for SM4+ the sampler index doesn't have to match - * the resource index. */ + /* If ARB_texture_swizzle is supported we don't need to do anything here. + * We actually rely on it for vertex shaders and SM4+. */ if (version->type == WINED3D_SHADER_TYPE_PIXEL && version->major < 4) { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; @@ -8035,7 +8034,8 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3]) shader_model = 5; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 50) && gl_info->supported[WINED3D_GL_VERSION_3_2] - && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS]) + && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] + && gl_info->supported[ARB_TEXTURE_SWIZZLE]) shader_model = 4; /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 * texldd and texldl instructions. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9aa0fa1..db30868 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2786,7 +2786,10 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 args->color_fixup[i] = COLOR_FIXUP_IDENTITY; continue; } - args->color_fixup[i] = texture->resource.format->color_fixup; + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + args->color_fixup[i] = COLOR_FIXUP_IDENTITY; + else + args->color_fixup[i] = texture->resource.format->color_fixup; if (texture->resource.format_flags & WINED3DFMT_FLAG_SHADOW) args->shadow |= 1u << i; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index feb6919..e163e83 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -219,6 +219,8 @@ void wined3d_texture_bind(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) { const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_format *format = texture->resource.format; + const struct color_fixup_desc fixup = format->color_fixup; struct gl_texture *gl_tex; GLenum target; @@ -330,6 +332,31 @@ void wined3d_texture_bind(struct wined3d_texture *texture, gl_info->gl_ops.gl.p_glTexParameteri(target, GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY); checkGLcall("glTexParameteri(GL_DEPTH_TEXTURE_MODE_ARB, GL_INTENSITY)"); } + + if (!is_identity_fixup(fixup) && can_use_texture_swizzle(gl_info, format)) + { + static const GLenum swizzle_source[] = + { + GL_ZERO, /* CHANNEL_SOURCE_ZERO */ + GL_ONE, /* CHANNEL_SOURCE_ONE */ + GL_RED, /* CHANNEL_SOURCE_X */ + GL_GREEN, /* CHANNEL_SOURCE_Y */ + GL_BLUE, /* CHANNEL_SOURCE_Z */ + GL_ALPHA, /* CHANNEL_SOURCE_W */ + }; + struct + { + GLint x, y, z, w; + } + swizzle; + + swizzle.x = swizzle_source[fixup.x_source]; + swizzle.y = swizzle_source[fixup.y_source]; + swizzle.z = swizzle_source[fixup.z_source]; + swizzle.w = swizzle_source[fixup.w_source]; + gl_info->gl_ops.gl.p_glTexParameteriv(target, GL_TEXTURE_SWIZZLE_RGBA, &swizzle.x); + checkGLcall("glTexParameteriv(GL_TEXTURE_SWIZZLE_RGBA)"); + } } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 506bc07..df22e80 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4840,7 +4840,10 @@ void gen_ffp_frag_op(const struct wined3d_context *context, const struct wined3d if ((texture = state->textures[i])) { - settings->op[i].color_fixup = texture->resource.format->color_fixup; + if (can_use_texture_swizzle(gl_info, texture->resource.format)) + settings->op[i].color_fixup = COLOR_FIXUP_IDENTITY; + else + settings->op[i].color_fixup = texture->resource.format->color_fixup; if (ignore_textype) { settings->op[i].tex_type = WINED3D_GL_RES_TYPE_TEX_1D; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9d2a96..7b7b65b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3435,6 +3435,12 @@ static inline BOOL needs_srgb_write(const struct wined3d_context *context, && fb->render_targets[0] && fb->render_targets[0]->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; } +static inline BOOL can_use_texture_swizzle(const struct wined3d_gl_info *gl_info, const struct wined3d_format *format) +{ + return gl_info->supported[ARB_TEXTURE_SWIZZLE] && !is_complex_fixup(format->color_fixup) + && !is_scaling_fixup(format->color_fixup); +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0

Matteo Bruni : wined3d: Add ARB_texture_swizzle extension.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 5cb85f3b2f2791c5f085bf720683b31caddee745 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cb85f3b2f2791c5f085bf720… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:09 2016 +0100 wined3d: Add ARB_texture_swizzle extension. 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/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f57f326..02c8a26 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -156,6 +156,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_texture_rectangle", ARB_TEXTURE_RECTANGLE }, {"GL_ARB_texture_rg", ARB_TEXTURE_RG }, {"GL_ARB_texture_rgb10_a2ui", ARB_TEXTURE_RGB10_A2UI }, + {"GL_ARB_texture_swizzle", ARB_TEXTURE_SWIZZLE }, {"GL_ARB_timer_query", ARB_TIMER_QUERY }, {"GL_ARB_uniform_buffer_object", ARB_UNIFORM_BUFFER_OBJECT }, {"GL_ARB_vertex_array_bgra", ARB_VERTEX_ARRAY_BGRA }, @@ -3473,6 +3474,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_SAMPLER_OBJECTS, MAKEDWORD_VERSION(3, 3)}, {ARB_SHADER_BIT_ENCODING, MAKEDWORD_VERSION(3, 3)}, {ARB_TEXTURE_RGB10_A2UI, MAKEDWORD_VERSION(3, 3)}, + {ARB_TEXTURE_SWIZZLE, MAKEDWORD_VERSION(3, 3)}, {ARB_TIMER_QUERY, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 8943cb0..f1f12ac 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -92,6 +92,7 @@ enum wined3d_gl_extension ARB_TEXTURE_RECTANGLE, ARB_TEXTURE_RG, ARB_TEXTURE_RGB10_A2UI, + ARB_TEXTURE_SWIZZLE, ARB_TIMER_QUERY, ARB_UNIFORM_BUFFER_OBJECT, ARB_VERTEX_ARRAY_BGRA,

1 0

Matteo Bruni : d3d11/tests: Add a test for DXGI_FORMAT_A8_UNORM textures.
by Alexandre Julliard 24 Mar '16

24 Mar '16

Module: wine Branch: master Commit: 05be74b6c4affc472d7f580bb2fd8bb4cfeeb6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=05be74b6c4affc472d7f580bb… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 23 21:19:11 2016 +0100 d3d11/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/d3d11/tests/d3d11.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9348aff..548636a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3627,6 +3627,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, @@ -3673,6 +3680,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}}}; @@ -3713,6 +3722,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, @@ -3785,6 +3801,7 @@ static void test_texture(void) {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 2.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample, &srgb_texture, D3D11_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, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, rgba_level_0}, {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 8.0f, 0.0f, D3D11_FLOAT32_MAX, 0.0f, level_1_colors}, {&ps_sample_b, &rgba_texture, D3D11_FILTER_MIN_MAG_MIP_POINT, 0.0f, 0.0f, D3D11_FLOAT32_MAX, 8.0f, level_1_colors}, @@ -3940,9 +3957,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

Paul Gofman : d3d9/tests: Add test for D3DFMT_L8 format as render target.
by Alexandre Julliard 24 Mar '16

24 Mar '16

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