wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Fabian Maurer : comctl32/taskdialog: Added support for custom buttons.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 5b06498b937c3ab88de32d4cb5cfcffb20f0d6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b06498b937c3ab88de32d4cb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 11 22:11:46 2017 +0300 comctl32/taskdialog: Added support for custom buttons. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 249 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 192 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b06498b937c3ab88de32…

1 0

Matteo Bruni : d3dx9/tests: Avoid SIZE_T in traces.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: df07533a800266a725224b33ec6aef02bfb0b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df07533a800266a725224b33e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:39 2017 +0200 d3dx9/tests: Avoid SIZE_T in traces. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 8882907..ff3b098 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -177,17 +177,17 @@ static void expect_matrix_(unsigned int line, const D3DXMATRIX *expected, const } #define expect_vec4_array(count, expected, vector, ulps) expect_vec4_array_(__LINE__, count, expected, vector, ulps) -static void expect_vec4_array_(unsigned int line, SIZE_T count, const D3DXVECTOR4 *expected, +static void expect_vec4_array_(unsigned int line, unsigned int count, const D3DXVECTOR4 *expected, const D3DXVECTOR4 *vector, unsigned int ulps) { BOOL equal; - SIZE_T i; + unsigned int i; for (i = 0; i < count; ++i) { equal = compare_vec4(&expected[i], &vector[i], ulps); ok_(__FILE__, line)(equal, - "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %lu, expected {%.8e, %.8e, %.8e, %.8e}.\n", + "Got unexpected vector {%.8e, %.8e, %.8e, %.8e} at index %u, expected {%.8e, %.8e, %.8e, %.8e}.\n", vector[i].x, vector[i].y, vector[i].z, vector[i].w, i, expected[i].x, expected[i].y, expected[i].z, expected[i].w); if (!equal)

1 0

Matteo Bruni : d3dx9/tests: Add a comment about the negation in boolean constant checks.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 82029cba2fcc49c39902f4ba3247c6216fdb9304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82029cba2fcc49c39902f4ba3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:38 2017 +0200 d3dx9/tests: Add a comment about the negation in boolean constant checks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 20da3c6..d75c5ce 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4350,6 +4350,8 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire { for (i = 0; i < ARRAY_SIZE(test_effect_preshader_bconsts); ++i) { + /* The negation on both sides is actually needed, sometimes you + * get 0xffffffff instead of 1 on native. */ ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u.\n", test_effect_preshader_bconsts[i], bdata[i], i); @@ -4362,6 +4364,8 @@ static void test_effect_preshader_compare_pbool_consts_(unsigned int line, IDire if (const_updated_mask[i / TEST_EFFECT_BITMASK_BLOCK_SIZE] & (1u << (i % TEST_EFFECT_BITMASK_BLOCK_SIZE))) { + /* The negation on both sides is actually needed, sometimes + * you get 0xffffffff instead of 1 on native. */ ok_(__FILE__, line)(!bdata[i] == !test_effect_preshader_bconsts[i], "Pixel shader boolean constants do not match, expected %#x, got %#x, i %u, parameter %s.\n", test_effect_preshader_bconsts[i], bdata[i], i, updated_param);

1 0

Matteo Bruni : d3dx9/tests: Fix compilation when the NAN macro is not available.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 26175489ba7a3f41bd6955e4877a7d6890b9f5cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=26175489ba7a3f41bd6955e48… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:36 2017 +0200 d3dx9/tests: Fix compilation when the NAN macro is not available. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 6ec07a2..20da3c6 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -31,6 +31,16 @@ static inline float __port_infinity(void) #define INFINITY __port_infinity() #endif /* INFINITY */ +#ifndef NAN +static float get_nan(void) +{ + DWORD nan = 0x7fc00000; + + return *(float *)&nan; +} +#define NAN get_nan() +#endif + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(*arr)) /* helper functions */ @@ -4751,7 +4761,7 @@ static const DWORD test_effect_preshader_ops_blob[] = static void test_effect_preshader_ops(IDirect3DDevice9 *device) { static D3DLIGHT9 light; - static const struct + const struct { const char *mnem; unsigned int expected_result[4];

1 0

Matteo Bruni : d3dx9: Move set_number() into d3dx9_private.h.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: wine Branch: master Commit: 4569cbe8e98c074398aefea47eaa1d63ec96caae URL: http://source.winehq.org/git/wine.git/?a=commit;h=4569cbe8e98c074398aefea47… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Jun 9 21:19:35 2017 +0200 d3dx9: Move set_number() into d3dx9_private.h. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/d3dx9_private.h | 84 +++++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/util.c | 89 ------------------------------------------- 2 files changed, 82 insertions(+), 91 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 8eb12b7..c2f4977 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -123,8 +123,88 @@ const char *debug_d3dxparameter_type(D3DXPARAMETER_TYPE t) DECLSPEC_HIDDEN; const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) DECLSPEC_HIDDEN; /* parameter type conversion helpers */ -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, - const void *indata, D3DXPARAMETER_TYPE intype) DECLSPEC_HIDDEN; +static inline BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_INT: + case D3DXPT_BOOL: + return !!*(DWORD *)data; + + case D3DXPT_VOID: + return *(BOOL *)data; + + default: + return FALSE; + } +} + +static inline int get_int(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + return (int)(*(float *)data); + + case D3DXPT_INT: + case D3DXPT_VOID: + return *(int *)data; + + case D3DXPT_BOOL: + return get_bool(type, data); + + default: + return 0; + } +} + +static inline float get_float(D3DXPARAMETER_TYPE type, const void *data) +{ + switch (type) + { + case D3DXPT_FLOAT: + case D3DXPT_VOID: + return *(float *)data; + + case D3DXPT_INT: + return (float)(*(int *)data); + + case D3DXPT_BOOL: + return (float)get_bool(type, data); + + default: + return 0.0f; + } +} + +static inline void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) +{ + if (outtype == intype) + { + *(DWORD *)outdata = *(DWORD *)indata; + return; + } + + switch (outtype) + { + case D3DXPT_FLOAT: + *(float *)outdata = get_float(intype, indata); + break; + + case D3DXPT_BOOL: + *(BOOL *)outdata = get_bool(intype, indata); + break; + + case D3DXPT_INT: + *(int *)outdata = get_int(intype, indata); + break; + + default: + *(DWORD *)outdata = 0; + break; + } +} static inline BOOL is_param_type_sampler(D3DXPARAMETER_TYPE type) { diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index 8f9b0b3..9e4bbbf 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -291,95 +291,6 @@ const char *debug_d3dxparameter_registerset(D3DXREGISTER_SET r) #undef WINE_D3DX_TO_STR -/* parameter type conversion helpers */ -static BOOL get_bool(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_INT: - case D3DXPT_BOOL: - return *(DWORD *)data != 0; - - case D3DXPT_VOID: - return *(BOOL *)data; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return FALSE; - } -} - -static INT get_int(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - return (INT)(*(FLOAT *)data); - - case D3DXPT_INT: - case D3DXPT_VOID: - return *(INT *)data; - - case D3DXPT_BOOL: - return get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0; - } -} - -static FLOAT get_float(D3DXPARAMETER_TYPE type, const void *data) -{ - switch (type) - { - case D3DXPT_FLOAT: - case D3DXPT_VOID: - return *(FLOAT *)data; - - case D3DXPT_INT: - return (FLOAT)(*(INT *)data); - - case D3DXPT_BOOL: - return (FLOAT)get_bool(type, data); - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(type)); - return 0.0f; - } -} - -void set_number(void *outdata, D3DXPARAMETER_TYPE outtype, const void *indata, D3DXPARAMETER_TYPE intype) -{ - if (outtype == intype) - { - *(DWORD *)outdata = *(DWORD *)indata; - return; - } - - switch (outtype) - { - case D3DXPT_FLOAT: - *(FLOAT *)outdata = get_float(intype, indata); - break; - - case D3DXPT_BOOL: - *(BOOL *)outdata = get_bool(intype, indata); - break; - - case D3DXPT_INT: - *(INT *)outdata = get_int(intype, indata); - break; - - default: - FIXME("Unhandled type %s.\n", debug_d3dxparameter_type(outtype)); - *(DWORD *)outdata = 0; - break; - } -} - - /*********************************************************************** * D3DXDebugMute * Returns always FALSE for us.

1 0

Francois Gouget : testbot/TestLauncher: Compress the TestLauncher binaries.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: b70fbe6405e0c0d53065bbf67b79079035ff6896 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b70fbe6405e0c0d53065bbf6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:51 2017 +0200 testbot/TestLauncher: Compress the TestLauncher binaries. They are sent to the VMs for every test so we want them to be as small as possible. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/TestLauncher/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 06b3729..6b41e01 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -4,16 +4,25 @@ CROSSCC32 = i686-w64-mingw32-gcc CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip +CROSSZIPEXE = upx-ucl all: TestLauncher32.exe TestLauncher64.exe TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + if which $(CROSSZIPEXE); \ + then \ + $(CROSSZIPEXE) --best -q -q $@; \ + fi clean: rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : testbot: Rebuild TestLauncher as part of the Reconfig.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: e1fb1b57a7adacb6c3eb48d9f1ed5b7af70e1acf URL: http://source.winehq.org/git/tools.git/?a=commit;h=e1fb1b57a7adacb6c3eb48d9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 18:26:45 2017 +0200 testbot: Rebuild TestLauncher as part of the Reconfig. Currently the TestLauncher binaries are checked into Git which is wrong and means they are effectively never updated. Now that Reconfig.pl rebuilds them the TestBot server will be able to retrive the up-to-date binaries and use them. Modify the TestLauncher makefile so it does not overwrite the checked-in TestLauncher binaries. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Reconfig.pl | 30 +++++++++++++++++++----------- testbot/src/TestLauncher/Makefile | 9 ++++++--- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index e522e94..dfc338b 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -115,6 +115,20 @@ sub BuildTestAgentd() return 1; } +sub BuildTestLauncher() +{ + system("( cd $::RootDir/src/TestLauncher && set -x && " . + " time make -j$ncpus" . + ") >>$LogDir/Reconfig.log 2>&1"); + if ($? != 0) + { + LogMsg "Build TestLauncher failed\n"; + return !1; + } + + return 1; +} + sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); @@ -173,17 +187,11 @@ if (! GitPull()) CountCPUs(); -if (! BuildTestAgentd()) -{ - exit(1); -} - -if (! BuildNative()) -{ - exit(1); -} - -if (! BuildCross(32) || ! BuildCross(64)) +if (!BuildTestAgentd() || + !BuildTestLauncher() || + !BuildNative() || + !BuildCross(32) || + !BuildCross(64)) { exit(1); } diff --git a/testbot/src/TestLauncher/Makefile b/testbot/src/TestLauncher/Makefile index 2bce2a1..06b3729 100644 --- a/testbot/src/TestLauncher/Makefile +++ b/testbot/src/TestLauncher/Makefile @@ -5,12 +5,15 @@ CROSSSTRIP32 = i686-w64-mingw32-strip CROSSCC64 = x86_64-w64-mingw32-gcc CROSSSTRIP64 = x86_64-w64-mingw32-strip -all: $(bindir)/TestLauncher32.exe $(bindir)/TestLauncher64.exe +all: TestLauncher32.exe TestLauncher64.exe -$(bindir)/TestLauncher32.exe: TestLauncher.c +TestLauncher32.exe: TestLauncher.c $(CROSSCC32) -Wall -o $@ $< $(CROSSSTRIP32) $@ -$(bindir)/TestLauncher64.exe: TestLauncher.c +TestLauncher64.exe: TestLauncher.c $(CROSSCC64) -Wall -o $@ $< $(CROSSSTRIP64) $@ + +clean: + rm -f TestLauncher32.exe TestLauncher64.exe

1 0

Francois Gouget : winetest: Add proper command line options.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: 889251094365fb255d169d47a0d9f50ee93702d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=889251094365fb255d169d47… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:41:40 2017 +0200 winetest: Add proper command line options. This makes it possible to specify the workdir or which report or build directory to work on. The latter make it possible to manually update the generated files for the reports. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 75 +++++++++++++++++++++++++++++++- winetest/build-index | 80 +++++++++++++++++++++++++++++++++- winetest/dissect | 96 +++++++++++++++++++++++++++++++++++++--- winetest/gather | 118 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 347 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=889251094365fb255d16…

1 0

Francois Gouget : winetest/gather: Don' t issue an error if outdated is already gone.
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: be316759900f806c0cf164df1ea3278a49129578 URL: http://source.winehq.org/git/tools.git/?a=commit;h=be316759900f806c0cf164df… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:15:12 2017 +0200 winetest/gather: Don't issue an error if outdated is already gone. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/gather b/winetest/gather index 2886bc5..fe1dfb4 100755 --- a/winetest/gather +++ b/winetest/gather @@ -821,7 +821,8 @@ if (!rename "$filename.new", "$filename") write_totals(\@groups); DONE: -if (!unlink $outdated) { +if (!unlink $outdated and !$!{ENOENT}) +{ error("unable to unlink '$outdated': $!\n"); exit 3; }

1 0

Francois Gouget : winetest: Use relative paths in get_build_info().
by Alexandre Julliard 12 Jun '17

12 Jun '17

Module: tools Branch: master Commit: a35fe43d2392f77d8c43e20cef571e702ef5898f URL: http://source.winehq.org/git/tools.git/?a=commit;h=a35fe43d2392f77d8c43e20c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 12 11:14:47 2017 +0200 winetest: Use relative paths in get_build_info(). It is meant to be called from the work directory anyway, just like the rest of the scripts. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 4 ++-- winetest/dissect | 4 ++-- winetest/gather | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index dcd9795..fb949b1 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,11 +62,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/dissect b/winetest/dissect index 99e50fb..ae8a0e5 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -81,11 +81,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject); diff --git a/winetest/gather b/winetest/gather index 94f3541..2886bc5 100755 --- a/winetest/gather +++ b/winetest/gather @@ -76,11 +76,11 @@ sub get_build_info($) { ($date, $subject) = ($1, $2); # Make sure the directory's mtime matches the commit time - utime $date, $date, "$workdir/data/$build"; + utime $date, $date, "data/$build"; } else { - $date = (stat "$workdir/data/$build")[9]; + $date = (stat "data/$build")[9]; $subject = ""; } return ($date, $subject);

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017