February 2016 - Wine-Commits

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox().
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 9c280ddc841f5e4cb085ea7bfbd2beccabaed410 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c280ddc841f5e4cb085ea7bf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:38 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_3d_LockBox(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c096d43..a47c439 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1141,7 +1141,6 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, UINT level, D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) { struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_volume *volume_impl; HRESULT hr; @@ -1149,13 +1148,10 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface, iface, level, locked_box, box, flags); wined3d_mutex_lock(); - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) + if (!(volume_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - { - volume_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DVolume9_LockBox(&volume_impl->IDirect3DVolume9_iface, locked_box, box, flags); - } wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : makefiles: Generate the top-level .gitignore and the distclean rules.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 77c1b7e352ecd2716aa7f70eaeebf3648dc6c7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=77c1b7e352ecd2716aa7f70ea… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 18:06:25 2016 +0900 makefiles: Generate the top-level .gitignore and the distclean rules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 2 +- aclocal.m4 | 28 +++----------------- configure | 80 ++++++++++++--------------------------------------------- configure.ac | 30 +--------------------- tools/makedep.c | 9 ++++--- 5 files changed, 28 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=77c1b7e352ecd2716aa7f…

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect().
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: ec590c8404e631628b5e08f9dbf064c69bc23ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec590c8404e631628b5e08f9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:36 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_UnlockRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 523ad92..f9d45c5 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -776,7 +776,6 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, D3DCUBEMAP_FACES face, UINT level) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; HRESULT hr; @@ -785,13 +784,10 @@ static HRESULT WINAPI d3d9_texture_cube_UnlockRect(IDirect3DCubeTexture9 *iface, wined3d_mutex_lock(); sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) hr = D3DERR_INVALIDCALL; else - { - surface_impl = wined3d_resource_get_parent(sub_resource); hr = IDirect3DSurface9_UnlockRect(&surface_impl->IDirect3DSurface9_iface); - } wined3d_mutex_unlock(); return hr;

1 0

Alexandre Julliard : makefiles: Expand the ln -s command into the makefiles.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: fb43551a0d031f0dc6f2d0d6b66ff43f482243f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb43551a0d031f0dc6f2d0d6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 15:13:00 2016 +0900 makefiles: Expand the ln -s command into the makefiles. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4174cb1..27fc997 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -147,6 +147,7 @@ static const char *rsvg; static const char *icotool; static const char *dlltool; static const char *msgfmt; +static const char *ln_s; struct makefile { @@ -2150,7 +2151,7 @@ static struct strarray output_install_rules( const struct makefile *make, struct install_sh, src_dir_path( make, file ), dest + 1 ); break; case 'y': /* symlink */ - output( "\trm -f $(DESTDIR)%s && $(LN_S) %s $(DESTDIR)%s\n", dest + 1, file, dest + 1 ); + output( "\trm -f $(DESTDIR)%s && %s %s $(DESTDIR)%s\n", dest + 1, ln_s, file, dest + 1 ); break; default: assert(0); @@ -2187,14 +2188,14 @@ static struct strarray output_importlib_symlinks( const struct makefile *parent, dir = obj_dir_path( parent, "dlls" ); lib = strmake( "lib%s.%s", make->importlib, *dll_ext ? "def" : "a" ); output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); strarray_add( &ret, strmake( "%s/%s", dir, lib )); if (crosstarget && !make->is_win16) { lib = strmake( "lib%s.cross.a", make->importlib ); output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); - output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + output( "\trm -f $@ && %s %s/%s $@\n", ln_s, make->base_dir + strlen("dlls/"), lib ); strarray_add( &ret, strmake( "%s/%s", dir, lib )); } return ret; @@ -2837,7 +2838,7 @@ static struct strarray output_sources( const struct makefile *make ) for (i = 1; i < names.count; i++) { output( "%s: %s\n", obj_dir_path( make, names.str[i] ), obj_dir_path( make, names.str[i-1] )); - output( "\trm -f $@ && $(LN_S) %s $@\n", names.str[i-1] ); + output( "\trm -f $@ && %s %s $@\n", ln_s, names.str[i-1] ); add_install_rule( make, install_rules, names.str[i], names.str[i-1], strmake( "y$(libdir)/%s", names.str[i] )); } @@ -2998,7 +2999,7 @@ static struct strarray output_sources( const struct makefile *make ) { output_filenames_obj_dir( make, symlinks ); output( ": %s\n", obj_dir_path( make, program )); - output( "\trm -f $@ && $(LN_S) %s $@\n", obj_dir_path( make, program )); + output( "\trm -f $@ && %s %s $@\n", ln_s, obj_dir_path( make, program )); strarray_addall( &all_targets, symlinks ); } @@ -3542,6 +3543,7 @@ int main( int argc, char *argv[] ) icotool = get_expanded_make_variable( top_makefile, "ICOTOOL" ); dlltool = get_expanded_make_variable( top_makefile, "DLLTOOL" ); msgfmt = get_expanded_make_variable( top_makefile, "MSGFMT" ); + ln_s = get_expanded_make_variable( top_makefile, "LN_S" ); if (root_src_dir && !strcmp( root_src_dir, "." )) root_src_dir = NULL; if (tools_dir && !strcmp( tools_dir, "." )) tools_dir = NULL;

1 0

Henri Verbeet : d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_GetCubeMapSurface().
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: 74bc7c43383652246bd86837c6feee7ef4788afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=74bc7c43383652246bd86837c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 25 19:48:37 2016 +0100 d3d9: Use wined3d_texture_get_sub_resource_parent() in d3d9_texture_cube_GetCubeMapSurface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/texture.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index f9d45c5..c096d43 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -719,7 +719,6 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9 D3DCUBEMAP_FACES face, UINT level, IDirect3DSurface9 **surface) { struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - struct wined3d_resource *sub_resource; struct d3d9_surface *surface_impl; UINT sub_resource_idx; DWORD level_count; @@ -735,13 +734,12 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9 } sub_resource_idx = level_count * face + level; - if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) + if (!(surface_impl = wined3d_texture_get_sub_resource_parent(texture->wined3d_texture, sub_resource_idx))) { wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - surface_impl = wined3d_resource_get_parent(sub_resource); *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); wined3d_mutex_unlock();

1 0

Alexandre Julliard : configure: Only check for libgettextpo when explicitly requested.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: d5b3afe35719209c4dbb402cac6bf453e1e807f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5b3afe35719209c4dbb402ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 18:20:21 2016 +0900 configure: Only check for libgettextpo when explicitly requested. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 9 +++------ configure.ac | 13 +++++-------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/configure b/configure index eddf07b..f189c99 100755 --- a/configure +++ b/configure @@ -12416,7 +12416,7 @@ This is an error since --with-zlib was requested." "$LINENO" 5 ;; esac fi -if test "x$enable_tools" != xno +if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" then @@ -12465,9 +12465,7 @@ $as_echo "#define HAVE_LIBGETTEXTPO 1" >>confdefs.h fi fi - if test "x$with_gettextpo" = xyes - then - if test "x$GETTEXTPO_LIBS" = "x"; then : + if test "x$GETTEXTPO_LIBS" = "x"; then : case "x$with_gettextpo" in x) as_fn_append wine_notices "|GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt." ;; xno) ;; @@ -12475,7 +12473,7 @@ fi This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi - if test "$srcdir" != .; then : + if test "$srcdir" != .; then : case "x$with_gettextpo" in x) as_fn_append wine_notices "|Rebuilding po files is not supported for out of tree builds." ;; xno) ;; @@ -12483,7 +12481,6 @@ fi This is an error since --with-gettextpo was requested." "$LINENO" 5 ;; esac fi - fi fi if test "x$with_pulse" != "xno"; diff --git a/configure.ac b/configure.ac index 73e4140..e20cbe7 100644 --- a/configure.ac +++ b/configure.ac @@ -1435,7 +1435,7 @@ fi WINE_NOTICE_WITH(zlib,[test "x$Z_LIBS" = "x"],[libz ${notice_platform}development files not found, data compression won't be supported.]) dnl **** Check for gettextpo **** -if test "x$enable_tools" != xno +if test "x$enable_tools" != xno -a "x$with_gettextpo" = xyes then if test "$ac_cv_header_gettext_po_h" = "yes" then @@ -1443,13 +1443,10 @@ then [AC_DEFINE(HAVE_LIBGETTEXTPO,1,[Define to 1 if you have the `gettextpo' library (-lgettextpo).]) AC_SUBST(GETTEXTPO_LIBS,"-lgettextpo")]) fi - if test "x$with_gettextpo" = xyes - then - WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], - [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) - WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], - [Rebuilding po files is not supported for out of tree builds.]) - fi + WINE_NOTICE_WITH(gettextpo,[test "x$GETTEXTPO_LIBS" = "x"], + [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) + WINE_NOTICE_WITH(gettextpo,[test "$srcdir" != .], + [Rebuilding po files is not supported for out of tree builds.]) fi dnl **** Check for PulseAudio ****

1 0

Alexandre Julliard : makefiles: Generate rules for import libraries symlinks.
by Alexandre Julliard Feb. 26, 2016

Feb. 26, 2016

Module: wine Branch: master Commit: f74638f94014d58cb73dda4a1f329686a9c51058 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f74638f94014d58cb73dda4a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 15:10:06 2016 +0900 makefiles: Generate rules for import libraries symlinks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 12 ------------ configure | 12 ------------ tools/makedep.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 34 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4171f47..abe5ca4 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -457,21 +457,9 @@ $ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) if test "$ac_name" != "$ac_implib" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT -dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT - \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$[@] -clean:: - \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.cross.a -dlls/lib$ac_implib.cross.a: $ac_file.cross.a - \$(RM) \$[@] && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$[@] -clean:: - \$(RM) dlls/lib$ac_implib.cross.a" wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" fi fi diff --git a/configure b/configure index 6342d91..06c6832 100755 --- a/configure +++ b/configure @@ -7684,21 +7684,9 @@ $ac_file.cross.a: $srcdir/$ac_dir/$ac_name.spec \$(WINEBUILD) if test "$ac_name" != "$ac_implib" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.$IMPLIBEXT -dlls/lib$ac_implib.$IMPLIBEXT: $ac_file.$IMPLIBEXT - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.$IMPLIBEXT \$@ -clean:: - \$(RM) dlls/lib$ac_implib.$IMPLIBEXT" wine_fn_ignore_file "dlls/lib$ac_implib.$IMPLIBEXT" if test -n "$CROSSTARGET" -a -z "$ac_implibflags" then - wine_fn_append_rule \ -"__builddeps__: dlls/lib$ac_implib.cross.a -dlls/lib$ac_implib.cross.a: $ac_file.cross.a - \$(RM) \$@ && \$(LN_S) $ac_name/lib$ac_implib.cross.a \$@ -clean:: - \$(RM) dlls/lib$ac_implib.cross.a" wine_fn_ignore_file "dlls/lib$ac_implib.cross.a" fi fi diff --git a/tools/makedep.c b/tools/makedep.c index 45c9209..4174cb1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2167,6 +2167,41 @@ static struct strarray output_install_rules( const struct makefile *make, struct /******************************************************************* + * output_importlib_symlinks + */ +static struct strarray output_importlib_symlinks( const struct makefile *parent, + const struct makefile *make ) +{ + struct strarray ret = empty_strarray; + const char *dir, *lib; + + if (!make->module) return ret; + if (!make->importlib) return ret; + if (strncmp( make->base_dir, "dlls/", 5 )) return ret; + if (!strcmp( make->module, make->importlib )) return ret; + if (!strchr( make->importlib, '.' ) && + !strncmp( make->module, make->importlib, strlen( make->importlib )) && + !strcmp( make->module + strlen( make->importlib ), ".dll" )) + return ret; + + dir = obj_dir_path( parent, "dlls" ); + lib = strmake( "lib%s.%s", make->importlib, *dll_ext ? "def" : "a" ); + output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); + output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + strarray_add( &ret, strmake( "%s/%s", dir, lib )); + + if (crosstarget && !make->is_win16) + { + lib = strmake( "lib%s.cross.a", make->importlib ); + output( "%s/%s: %s\n", dir, lib, base_dir_path( make, lib )); + output( "\trm -f $@ && $(LN_S) %s/%s $@\n", make->base_dir + strlen("dlls/"), lib ); + strarray_add( &ret, strmake( "%s/%s", dir, lib )); + } + return ret; +} + + +/******************************************************************* * output_po_files */ static void output_po_files( const struct makefile *make ) @@ -3006,18 +3041,20 @@ static struct strarray output_sources( const struct makefile *make ) if (make->subdirs.count) { + struct strarray build_deps = empty_strarray; struct strarray makefile_deps = empty_strarray; struct strarray distclean_files = empty_strarray; for (i = 0; i < make->subdirs.count; i++) { - strarray_add( &makefile_deps, top_dir_path( make, base_dir_path( make->submakes[i], + 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( &distclean_files, base_dir_path( make->submakes[i], output_makefile_name )); - if (!make->src_dir) - strarray_add( &distclean_files, base_dir_path( make->submakes[i], ".gitignore" )); - if (make->submakes[i]->testdll) - strarray_add( &distclean_files, base_dir_path( make->submakes[i], "testlist.c" )); + 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" )); + strarray_addall( &build_deps, output_importlib_symlinks( make, submake )); } output( "Makefile:" ); output_filenames( makefile_deps ); @@ -3030,10 +3067,7 @@ static struct strarray output_sources( const struct makefile *make ) if (msgfmt && strcmp( msgfmt, "false" )) { - strarray_addall( &clean_files, mo_files ); - output( "__builddeps__:" ); - output_filenames( mo_files ); - output( "\n" ); + strarray_addall( &build_deps, mo_files ); for (i = 0; i < linguas.count; i++) { output( "%s/%s.mo:", obj_dir_path( make, "po" ), linguas.str[i] ); @@ -3041,6 +3075,13 @@ static struct strarray output_sources( const struct makefile *make ) output( "\t%s -o $@ %s/%s.po\n", msgfmt, src_dir_path( make, "po" ), linguas.str[i] ); } } + if (build_deps.count) + { + output( "__builddeps__:" ); + output_filenames( build_deps ); + output( "\n" ); + strarray_addall( &clean_files, build_deps ); + } if (get_expanded_make_variable( make, "GETTEXTPO_LIBS" )) output_po_files( make ); }

1 0

Paul Gofman : d3dx9: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: 215e2d7fed58ccd7c5e55ad536fb311608b51d26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215e2d7fed58ccd7c5e55ad53… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Feb 25 17:34:04 2016 +0300 d3dx9: D3DXQuaternionToAxisAngle should not crash on NULLs in output parameters. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/math.c | 12 ++++++++---- dlls/d3dx9_36/tests/math.c | 11 ++++++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5e8d51a..123bd2f 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1652,10 +1652,14 @@ void WINAPI D3DXQuaternionToAxisAngle(const D3DXQUATERNION *pq, D3DXVECTOR3 *pax { TRACE("pq %p, paxis %p, pangle %p\n", pq, paxis, pangle); - paxis->x = pq->x; - paxis->y = pq->y; - paxis->z = pq->z; - *pangle = 2.0f * acosf(pq->w); + if (paxis) + { + paxis->x = pq->x; + paxis->y = pq->y; + paxis->z = pq->z; + } + if (pangle) + *pangle = 2.0f * acosf(pq->w); } /*_________________D3DXVec2_____________________*/ diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index ac4475d..cbe94b5 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1019,9 +1019,14 @@ static void D3DXQuaternionTest(void) /* Test the null quaternion */ expectedvec.x = 0.0f; expectedvec.y = 0.0f; expectedvec.z = 0.0f; expected = 3.141593f; - D3DXQuaternionToAxisAngle(&nul,&axis,&angle); - expect_vec3(expectedvec,axis); - ok(relative_error(angle, expected ) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + D3DXQuaternionToAxisAngle(&nul, &axis, &angle); + expect_vec3(expectedvec, axis); + ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); + + D3DXQuaternionToAxisAngle(&nul, &axis, NULL); + D3DXQuaternionToAxisAngle(&nul, NULL, &angle); + expect_vec3(expectedvec, axis); + ok(relative_error(angle, expected) < admitted_error, "Expected: %f, Got: %f\n", expected, angle); } static void D3DXVector2Test(void)

1 0

Miklós Máté : winex11: Add 1280x960 resolution.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: c0219a73848245d5f3b85c79330b2bb1792df230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0219a73848245d5f3b85c793… Author: Miklós Máté <mtmkls(a)gmail.com> Date: Tue Feb 23 18:37:30 2016 +0100 winex11: Add 1280x960 resolution. This enables high resolution setting in Anachronox, when Wine is configured to emulate a virtual desktop. The game only supports 640x480 and 1280x960. Signed-off-by: Miklós Máté <mtmkls(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 9b5e27b..72916c8 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -37,8 +37,8 @@ static unsigned int dd_mode_count; static unsigned int max_width; static unsigned int max_height; -static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1400, 1600}; -static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 1024, 1050, 1200}; +static const unsigned int widths[] = {320, 400, 512, 640, 800, 1024, 1152, 1280, 1280, 1400, 1600}; +static const unsigned int heights[] = {200, 300, 384, 480, 600, 768, 864, 960, 1024, 1050, 1200}; #define NUM_DESKTOP_MODES (sizeof(widths) / sizeof(widths[0])) #define _NET_WM_STATE_REMOVE 0

1 0

Piotr Caban : msvcp100: Add std::generic_category() implementation.
by Alexandre Julliard Feb. 25, 2016

Feb. 25, 2016

Module: wine Branch: master Commit: ede38f4fdb457475708db0f2689f7ec5276c3f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ede38f4fdb457475708db0f26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 25 10:47:47 2016 +0100 msvcp100: Add std::generic_category() implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp90/misc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp100/msvcp100.spec b/dlls/msvcp100/msvcp100.spec index 62403d5..663a8f6 100644 --- a/dlls/msvcp100/msvcp100.spec +++ b/dlls/msvcp100/msvcp100.spec @@ -1742,8 +1742,8 @@ @ cdecl -arch=win64 ?gcount@?$basic_istream(a)GU?$char_traits(a)G@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount @ thiscall -ret64 -arch=win32 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QBE_JXZ(ptr) basic_istream_wchar_gcount @ cdecl -arch=win64 ?gcount@?$basic_istream(a)_WU?$char_traits(a)_W@std@@@std@@QEBA_JXZ(ptr) basic_istream_wchar_gcount -@ stub -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ -@ stub -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ +@ cdecl -arch=win32 ?generic_category(a)std@@YAABVerror_category(a)1@XZ() std_generic_category +@ cdecl -arch=win64 ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ() std_generic_category @ thiscall -arch=win32 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAD@Z(ptr ptr) basic_istream_char_get_ch @ cdecl -arch=win64 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QEAAAEAV12(a)AEAD@Z(ptr ptr) basic_istream_char_get_ch @ thiscall -arch=win32 ?get@?$basic_istream(a)DU?$char_traits(a)D@std@@@std@@QAEAAV12(a)AAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2@@Z(ptr ptr) basic_istream_char_get_streambuf diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 7ec4f19..a4713d2 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -736,6 +736,25 @@ const error_category* __cdecl std_system_category(void) TRACE("()\n"); return &system_category.base; } + +static custom_category generic_category; +DEFINE_RTTI_DATA1(generic_category, 0, &error_category_rtti_base_descriptor, ".?AV_Generic_error_category(a)std@@") + +extern const vtable_ptr MSVCP_generic_category_vtable; + +static void generic_category_ctor(custom_category *this) +{ + this->base.vtable = &MSVCP_generic_category_vtable; + this->type = "generic"; +} + +/* ?generic_category(a)std@@YAABVerror_category(a)1@XZ */ +/* ?generic_category(a)std@@YAAEBVerror_category(a)1@XZ */ +const error_category* __cdecl std_generic_category(void) +{ + TRACE("()\n"); + return &generic_category.base; +} #endif #if _MSVCP_VER >= 110 @@ -1026,6 +1045,13 @@ void __asm_dummy_vtables(void) { VTABLE_ADD_FUNC(custom_category_default_error_condition) VTABLE_ADD_FUNC(custom_category_equivalent) VTABLE_ADD_FUNC(custom_category_equivalent_code)); + __ASM_VTABLE(generic_category, + VTABLE_ADD_FUNC(custom_category_vector_dtor) + VTABLE_ADD_FUNC(custom_category_name) + VTABLE_ADD_FUNC(custom_category_message) + VTABLE_ADD_FUNC(custom_category_default_error_condition) + VTABLE_ADD_FUNC(custom_category_equivalent) + VTABLE_ADD_FUNC(custom_category_equivalent_code)); #endif #if _MSVCP_VER >= 110 __ASM_VTABLE(_Pad, @@ -1042,6 +1068,7 @@ void init_misc(void *base) init_error_category_rtti(base); init_iostream_category_rtti(base); init_system_category_rtti(base); + init_generic_category_rtti(base); #endif #if _MSVCP_VER >= 110 init__Pad_rtti(base); @@ -1051,6 +1078,7 @@ void init_misc(void *base) #if _MSVCP_VER == 100 iostream_category_ctor(&iostream_category); system_category_ctor(&system_category); + generic_category_ctor(&generic_category); #endif }

1 0