July 2019 - Wine-commits - list.winehq.org

Jactry Zeng : vkd3d: Handle SINT and UINT formats in ClearRenderTargetView ().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: vkd3d Branch: master Commit: 9d138ee13588d17aa6c3fcf230f7713d67cc2445 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d138ee13588d17aa6c3fcf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Jul 30 11:40:31 2019 +0200 vkd3d: Handle SINT and UINT formats in ClearRenderTargetView(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 24 +++++++++++++++++++++++- libs/vkd3d/utils.c | 46 +++++++++++++++++++++++++--------------------- libs/vkd3d/vkd3d_private.h | 8 ++++++++ tests/d3d12.c | 2 -- 4 files changed, 56 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9d138ee13588d17aa6c…

1 0

Józef Kucia : vkd3d: Get rid of dxgi_format_is_typeless().
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: vkd3d Branch: master Commit: 0d851513dc5873fc75feaefea104c8f4de934e47 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0d851513dc5873fc75feaef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 30 11:40:32 2019 +0200 vkd3d: Get rid of dxgi_format_is_typeless(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 2 +- libs/vkd3d/resource.c | 2 +- libs/vkd3d/utils.c | 82 +++++++++++++++------------------------------- libs/vkd3d/vkd3d_private.h | 3 +- 4 files changed, 29 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=0d851513dc5873fc75f…

1 0

Józef Kucia : tests: Introduce VKD3D_TEST_FILTER.
by Alexandre Julliard 31 Jul '19

31 Jul '19

Module: vkd3d Branch: master Commit: b71120d78d5d9aad2f9cb898493fa8bb31faecbd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b71120d78d5d9aad2f9cb89… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 17 13:17:35 2019 +0200 tests: Introduce VKD3D_TEST_FILTER. Useful for running a subset of tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 4 ++++ include/private/vkd3d_test.h | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/README b/README index 2f2f395..3c70ede 100644 --- a/README +++ b/README @@ -65,6 +65,10 @@ commas or semicolons. * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1 or 2. + * VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the + filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target. + Useful for debugging or developing new tests. + * VKD3D_TEST_PLATFORM - can be set to "wine", "windows" or "other". The test platform controls the behavior of todo(), todo_if(), bug_if() and broken() conditions in tests. diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index a37f6ff..319bf5d 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -118,6 +118,7 @@ static struct bool bug_do_loop; bool bug_enabled; + const char *test_name_filter; char context[1024]; } vkd3d_test_state; @@ -254,6 +255,7 @@ vkd3d_test_debug(const char *fmt, ...) int main(int argc, char **argv) { + const char *test_filter = getenv("VKD3D_TEST_FILTER"); const char *debug_level = getenv("VKD3D_TEST_DEBUG"); char *test_platform = getenv("VKD3D_TEST_PLATFORM"); const char *bug = getenv("VKD3D_TEST_BUG"); @@ -261,6 +263,7 @@ int main(int argc, char **argv) memset(&vkd3d_test_state, 0, sizeof(vkd3d_test_state)); vkd3d_test_state.debug_level = debug_level ? atoi(debug_level) : 0; vkd3d_test_state.bug_enabled = bug ? atoi(bug) : true; + vkd3d_test_state.test_name_filter = test_filter; if (test_platform) { @@ -341,6 +344,9 @@ typedef void (*vkd3d_test_pfn)(void); static inline void vkd3d_run_test(const char *name, vkd3d_test_pfn test_pfn) { + if (vkd3d_test_state.test_name_filter && !strstr(name, vkd3d_test_state.test_name_filter)) + return; + vkd3d_test_debug("%s", name); test_pfn(); }

1 0

Jeremy Newman : replace deprecated while each loops with foreach
by Jeremy Newman 30 Jul '19

30 Jul '19

Module: appdb Branch: master Commit: 4b9ef856207133e12c6ac6825fbb799c033f11d1 URL: https://source.winehq.org/git/appdb.git/?a=commit;h=4b9ef856207133e12c6ac68… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:41:54 2019 -0500 replace deprecated while each loops with foreach --- include/application.php | 54 ++++++++++++------------- include/category.php | 36 ++++++++--------- include/html.php | 4 +- include/maintainer.php | 46 ++++++++++----------- include/maintainerView.php | 20 +++++----- include/sidebar_login.php | 10 ++--- include/tableve.php | 54 ++++++++++++------------- include/util.php | 18 +++++---- include/version.php | 66 +++++++++++++++---------------- preferences.php | 12 +++--- unit_test/test_application.php | 90 +++++++++++++++++++++--------------------- votestats.php | 10 ++--- 12 files changed, 211 insertions(+), 209 deletions(-) Diff: https://source.winehq.org/git/appdb.git/?a=commitdiff;h=4b9ef856207133e12c6…

1 0

Jeremy Newman : replace while each loops with foreach
by Jeremy Newman 30 Jul '19

30 Jul '19

Module: website Branch: master Commit: c8a4bba855c5c92fdbd6a0ab66f749043940e257 URL: https://source.winehq.org/git/website.git/?a=commit;h=c8a4bba855c5c92fdbd6a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:16:19 2019 -0500 replace while each loops with foreach --- include/config.php | 4 ++-- include/plugins/announce.php | 4 ++-- include/utils.php | 8 ++++---- include/wwn.php | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/config.php b/include/config.php index c3fbed8..86c65fe 100644 --- a/include/config.php +++ b/include/config.php @@ -41,7 +41,7 @@ class config if (preg_match('/^\@/', $arr[0])) { // array - $arr[0] = preg_replace('/\@/', '', $arr[0]); + $arr[0] = preg_replace('/\@/', '', $arr[0]); $this->{$arr[0]} = preg_split('/,\s+/', $arr[1]); } else if (preg_match('/^\%/', $arr[0])) @@ -50,7 +50,7 @@ class config $arr[0] = preg_replace('/\%/', '', $arr[0]); $this->{$arr[0]} = array(); $params = preg_split('/,\s+/', $arr[1]); - while (list($n, $m) = each($params)) + foreach ($params as $n => $m) { list($key, $val) = preg_split('/\|/', $m, 2); $this->{$arr[0]} = array_merge($this->{$arr[0]}, array($key => $val)); diff --git a/include/plugins/announce.php b/include/plugins/announce.php index fb707a0..39bcd25 100644 --- a/include/plugins/announce.php +++ b/include/plugins/announce.php @@ -21,7 +21,7 @@ $title = ""; if ($arr = file($announce)) { $in_header = 1; - while (list($c,$val) = each($arr)) + foreach ($arr as $c => $val) { if ($c == 0) $title = $html->encode(trim($arr[$c])); @@ -42,7 +42,7 @@ if ($arr = file($announce)) $arr[$c] = preg_replace("/AUTHORS/", "<a href=\"".$config->git_tree."/wine.git/".$tag.":\\0\">\\0</a>", $arr[$c]); - } + } else if ($in_bugs) { $arr[$c] = preg_replace("/^( +)([0-9]+)/", diff --git a/include/utils.php b/include/utils.php index 21d5253..4876bd8 100644 --- a/include/utils.php +++ b/include/utils.php @@ -224,10 +224,10 @@ function get_files ($dir, $filter = null) array_push($files, $entry); } closedir($d); - + //sort dir sort($files); - + return $files; } @@ -288,7 +288,7 @@ function bytes2human ($bytes) // search an array for a key, and optionally the value function in_array_key ($key, $array, $value = false) { - while (list($k, $v) = each($array)) + foreach ($array as $k => $v) { if ($key == $k) { @@ -366,7 +366,7 @@ function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) // $order - SORT_ASC (default) for ascending or SORT_DESC for descending // $first - start index (row) for partial array sort // $last - stop index (row) for partial array sort - + if($last == -2) $last = count($array) - 1; if($last > $first) { diff --git a/include/wwn.php b/include/wwn.php index 7203b2f..d13957e 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -6,7 +6,7 @@ by Jeremy Newman <jnewman(a)codeweavers.com> */ -class wwn +class wwn { public $mode = 'wwn'; public $currentTag; @@ -114,7 +114,7 @@ class wwn if ($limit == 0) $back = '<div align=center><table cellpadding=0 cellspacing=20 width="100%"><tr valign=top>'."\n"; - while(list($issue,$file) = each($issues)) + foreach ($issues as $issue => $file) { // inner counter $num++; @@ -218,7 +218,7 @@ class wwn } $c = 0; - while(list($id,$sum) = each($this->summary)) + foreach ($this->summary as $id => $sum) { $summary_box .= '<li><a href="'.$html->_web_root."/".PAGE."/".$cur."#".$sum.'" class="small">'.$sum.'</a></li>'."\n"; $c++; @@ -460,7 +460,7 @@ class wwn if (isset($this->map_array[strtolower($name)])) { $attribs = ""; - while(list($key,$value) = each($attrs)) + foreach ($attrs as $key => $value) { $attribs .= " $key=\"$value\""; }

1 0

Jeremy Newman : remove unused funcs and fix for PHP 7.2
by Jeremy Newman 30 Jul '19

30 Jul '19

Module: website Branch: master Commit: 2a55925f0a9b8bf38e20a66e912a91c323461602 URL: https://source.winehq.org/git/website.git/?a=commit;h=2a55925f0a9b8bf38e20a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:14:39 2019 -0500 remove unused funcs and fix for PHP 7.2 * remove some unused code * while each loops are deprecated, use foreach --- include/html.php | 518 ++++--------------------------------------------------- 1 file changed, 30 insertions(+), 488 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=2a55925f0a9b8bf38…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 30 Jul '19

30 Jul '19

Module: website Branch: master Commit: 3420777678fd6db3da5fcf6fb24b2257c079042f URL: https://source.winehq.org/git/website.git/?a=commit;h=3420777678fd6db3da5fc… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Jul 30 11:16:11 2019 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 4.12.1
by Alexandre Julliard 07 Jul '19

07 Jul '19

Module: website Branch: master Commit: 8daa8d91847ba242a0643b754b663962c51fe860 URL: https://source.winehq.org/git/website.git/?a=commit;h=8daa8d91847ba242a0643… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:26:51 2019 +0200 Wine release 4.12.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019070701.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/news/en/2019070701.xml b/news/en/2019070701.xml new file mode 100644 index 0000000..7775c5e --- /dev/null +++ b/news/en/2019070701.xml @@ -0,0 +1,12 @@ +<news> +<date>July 7, 2019</date> +<title>Wine 4.12.1 Released</title> +<body> +<p> The Wine development release 4.12.1 is now available.</p> +<p> <a href="{$root}/announce/4.12.1">What's new</a> in this release: +<ul> + <li>Fixes for broken 64-bit prefix initialization.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.12.1.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : d3dcompiler: Make varargs functions WINAPIV.
by Alexandre Julliard 07 Jul '19

07 Jul '19

Module: wine Branch: master Commit: 43df1ed406143b9a9ba5b2450c21fece6563aa2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=43df1ed406143b9a9ba5b245… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 08:02:55 2019 +0200 d3dcompiler: Make varargs functions WINAPIV. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47473 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmshader.y | 2 +- dlls/d3dcompiler_43/compiler.c | 6 +++--- dlls/d3dcompiler_43/d3dcompiler_private.h | 6 +++--- dlls/d3dcompiler_43/hlsl.y | 4 ++-- dlls/d3dcompiler_43/ppl.l | 2 +- dlls/d3dcompiler_43/preproc.c | 2 +- dlls/d3dcompiler_43/wpp_private.h | 8 ++++---- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/asmshader.y b/dlls/d3dcompiler_43/asmshader.y index f5dbb6c..32b37d0 100644 --- a/dlls/d3dcompiler_43/asmshader.y +++ b/dlls/d3dcompiler_43/asmshader.y @@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(asmshader); struct asm_parser asm_ctx; -void __cdecl asmparser_message(struct asm_parser *ctx, const char *fmt, ...) +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) { __ms_va_list args; diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 1b2107c..73f8c70 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -123,7 +123,7 @@ static void wpp_write_message(const char *fmt, __ms_va_list args) } } -static void __cdecl PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) +static void WINAPIV PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) { __ms_va_list args; @@ -132,7 +132,7 @@ static void __cdecl PRINTF_ATTR(1,2) wpp_write_message_var(const char *fmt, ...) __ms_va_end(args); } -int __cdecl ppy_error(const char *msg, ...) +int WINAPIV ppy_error(const char *msg, ...) { __ms_va_list ap; __ms_va_start(ap, msg); @@ -146,7 +146,7 @@ int __cdecl ppy_error(const char *msg, ...) return 1; } -int __cdecl ppy_warning(const char *msg, ...) +int WINAPIV ppy_warning(const char *msg, ...) { __ms_va_list ap; __ms_va_start(ap, msg); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index d2162c8..e165f21 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -286,7 +286,7 @@ struct bwriter_shader *parse_asm_shader(char **messages) DECLSPEC_HIDDEN; #endif void compilation_message(struct compilation_messages *msg, const char *fmt, __ms_va_list args) DECLSPEC_HIDDEN; -void __cdecl asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +void WINAPIV asmparser_message(struct asm_parser *ctx, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; static inline void set_parse_status(enum parse_status *current, enum parse_status update) { if (update == PARSE_ERR) @@ -1055,8 +1055,8 @@ enum hlsl_error_level HLSL_LEVEL_NOTE, }; -void __cdecl hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; -void __cdecl hlsl_report_message(const char *filename, DWORD line, DWORD column, +void WINAPIV hlsl_message(const char *fmt, ...) PRINTF_ATTR(1,2) DECLSPEC_HIDDEN; +void WINAPIV hlsl_report_message(const char *filename, DWORD line, DWORD column, enum hlsl_error_level level, const char *fmt, ...) PRINTF_ATTR(5,6) DECLSPEC_HIDDEN; static inline struct hlsl_ir_var *var_from_node(const struct hlsl_ir_node *node) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 139ab4c..4ece669 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -34,7 +34,7 @@ struct hlsl_parse_ctx hlsl_ctx; struct YYLTYPE; static void set_location(struct source_location *loc, const struct YYLTYPE *l); -void __cdecl hlsl_message(const char *fmt, ...) +void WINAPIV hlsl_message(const char *fmt, ...) { __ms_va_list args; @@ -54,7 +54,7 @@ static const char *hlsl_get_error_level_name(enum hlsl_error_level level) return names[level]; } -void __cdecl hlsl_report_message(const char *filename, DWORD line, DWORD column, +void WINAPIV hlsl_report_message(const char *filename, DWORD line, DWORD column, enum hlsl_error_level level, const char *fmt, ...) { __ms_va_list args; diff --git a/dlls/d3dcompiler_43/ppl.l b/dlls/d3dcompiler_43/ppl.l index 2fd8c65..568ccb4 100644 --- a/dlls/d3dcompiler_43/ppl.l +++ b/dlls/d3dcompiler_43/ppl.l @@ -285,7 +285,7 @@ includelogicentry_t *pp_includelogiclist = NULL; #define BUFFERINITIALCAPACITY 256 -void __cdecl pp_writestring(const char *format, ...) +void WINAPIV pp_writestring(const char *format, ...) { __ms_va_list valist; int len; diff --git a/dlls/d3dcompiler_43/preproc.c b/dlls/d3dcompiler_43/preproc.c index 43a7d24..be98e6f 100644 --- a/dlls/d3dcompiler_43/preproc.c +++ b/dlls/d3dcompiler_43/preproc.c @@ -435,7 +435,7 @@ int pp_get_if_depth(void) return if_stack_idx; } -void __cdecl pp_internal_error(const char *file, int line, const char *s, ...) +void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) { __ms_va_list ap; __ms_va_start(ap, s); diff --git a/dlls/d3dcompiler_43/wpp_private.h b/dlls/d3dcompiler_43/wpp_private.h index 77025db..325c7f1 100644 --- a/dlls/d3dcompiler_43/wpp_private.h +++ b/dlls/d3dcompiler_43/wpp_private.h @@ -209,9 +209,9 @@ int pp_get_if_depth(void); extern const struct wpp_callbacks *wpp_callbacks; -int __cdecl ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); -int __cdecl ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); -void __cdecl pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); +int WINAPIV ppy_error(const char *s, ...) __attribute__((format (printf, 1, 2))); +int WINAPIV ppy_warning(const char *s, ...) __attribute__((format (printf, 1, 2))); +void WINAPIV pp_internal_error(const char *file, int line, const char *s, ...) __attribute__((format (printf, 3, 4))); /* current preprocessor state */ /* everything is in this structure to avoid polluting the global symbol space */ @@ -240,7 +240,7 @@ void pp_do_include(char *fname, int type); void pp_push_ignore_state(void); void pp_pop_ignore_state(void); -void __cdecl pp_writestring(const char *format, ...) __attribute__((format (printf, 1, 2))); +void WINAPIV pp_writestring(const char *format, ...) __attribute__((format (printf, 1, 2))); /* * From ppy.y

1 0

Alexandre Julliard : Release 4.12.1.
by Alexandre Julliard 07 Jul '19

07 Jul '19

Module: wine Branch: master Commit: 82543e7858758025b50bb5556cbedc43f4d628c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82543e7858758025b50bb555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 7 11:25:09 2019 +0200 Release 4.12.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 430 +++----------------------------------------------------------- VERSION | 2 +- configure | 18 +-- 3 files changed, 29 insertions(+), 421 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=82543e7858758025b50b…

1 0