November 2020 - Wine-commits

Zebediah Figura : qcap: Remove "stub" from an implemented function.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: fdae81b2082ed74bfac750ce7c5cf55f28291fdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdae81b2082ed74bfac750ce… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:02 2020 -0600 qcap: Remove "stub" from an implemented function. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index be1e4e773ad..c3ba6c4d3eb 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -239,7 +239,7 @@ static HRESULT WINAPI filesinkfilter_SetFileName(IFileSinkFilter *iface, struct file_writer *filter = impl_from_IFileSinkFilter(iface); WCHAR *new_filename; - TRACE("filter %p, filename %s, mt %p, stub!\n", filter, debugstr_w(filename), mt); + TRACE("filter %p, filename %s, mt %p.\n", filter, debugstr_w(filename), mt); strmbase_dump_media_type(mt); if (mt)

1 0

Zebediah Figura : qcap: Get rid of the VfwCapture typedef.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 417654b1ce66450c8213d57edf7dd030226bfe26 URL: https://source.winehq.org/git/wine.git/?a=commit;h=417654b1ce66450c8213d57e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:03 2020 -0600 qcap: Get rid of the VfwCapture typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 157 +++++++++++++++++++++++-------------------------- 1 file changed, 75 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=417654b1ce66450c8213…

1 0

Zebediah Figura : qcap: Call the right method to clean up the video capture stream.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 9a317e5cb5ff6aa53c1e6765b6c2d98884046d70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a317e5cb5ff6aa53c1e6765… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:04 2020 -0600 qcap: Call the right method to clean up the video capture stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index a313e785f67..a79cce50380 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -85,7 +85,7 @@ static void vfw_capture_destroy(struct strmbase_filter *iface) if (filter->init) { if (filter->filter.state != State_Stopped) - filter->device->ops->stop_stream(filter->device); + filter->device->ops->cleanup_stream(filter->device); filter->device->ops->destroy(filter->device); }

1 0

Bernhard Übelacker : gdi32: Avoid crash by initializing variable font_set.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: wine Branch: master Commit: 79d8ed4849c1fdc2d8a9e67e41d389ef0c227bac URL: https://source.winehq.org/git/wine.git/?a=commit;h=79d8ed4849c1fdc2d8a9e67e… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Nov 24 13:54:21 2020 +0100 gdi32: Avoid crash by initializing variable font_set. If the call pFcStrListNext returns NULL the loop is never entered and the variable font_set never gets written, leading to a crash cleaning up font_set by pFcFontSetDestroy. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 993110e6fe0..e7684728c9c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1468,7 +1468,7 @@ static void init_fontconfig(void) static void fontconfig_add_fonts_from_dir_list( FcConfig *config, FcStrList *dir_list, FcStrSet *done_set, DWORD flags ) { const FcChar8 *dir; - FcFontSet *font_set; + FcFontSet *font_set = NULL; FcStrList *subdir_list = NULL; FcStrSet *subdir_set = NULL; FcCache *cache = NULL;

1 0

Zebediah Figura : tests: Add some tests for #if expression evaluation.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: vkd3d Branch: master Commit: 34ff79b0f3263a17c491cf79771a2d90324ecbd0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=34ff79b0f3263a17c491cf7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 24 00:29:55 2020 -0600 tests: Add some tests for #if expression evaluation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 2 + tests/preproc-if-expr.shader_test | 261 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 263 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0ee7eda..2cb1567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,7 @@ vkd3d_shader_tests = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -210,6 +211,7 @@ XFAIL_TESTS = \ tests/math.shader_test \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ + tests/preproc-if-expr.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-if-expr.shader_test b/tests/preproc-if-expr.shader_test new file mode 100644 index 0000000..61c5a39 --- /dev/null +++ b/tests/preproc-if-expr.shader_test @@ -0,0 +1,261 @@ +[preproc] +#if 1 == 1 +pass +#endif + +[preproc] +#if 1 == 0 +fail +#endif +pass + +[preproc] +#if 2 +pass +#endif + +[preproc] +#if -1 +pass +#endif + +[preproc] +#if-1 +pass +#endif + +[preproc] +#if 1 + 1 == 2 +pass +#endif + +[preproc] +#if 1 + 1 == 3 +fail +#endif +pass + +[preproc] +#if 8 - 3 == 5 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 2 * 2 == 4 +pass +#endif + +[preproc] +#if 8 / 3 == 2 +pass +#endif + +[preproc] +#if 0x12 == 18 +pass +#endif + +[preproc] +#if 012 == 10 +pass +#endif + +[preproc] +#if -1 == 0xfffffff +fail +#elif -1 == 0xffffffff +pass +#endif + +[preproc] +#if -1 == 0xefffffffel +fail +#elif -1 == 0xeffffffffl +pass +#endif + +[preproc] +#if (-1 == 4294967295l) && (-1 == 8589934591l) && (1 == 4294967297l) +pass +#endif + +[preproc] +#if (-1ul == 4294967295ul) && (-1ul == 8589934591ul) && (1ul == 4294967297ul) +pass +#endif + +[preproc] +#if (-1lu == 4294967295lu) && (-1lu == 8589934591lu) && (1lu == 4294967297lu) +pass +#endif + +[preproc] +#if 36893488147419103233 == 1 +pass +#endif + +[preproc] +/* All math is done using unsigned 32-bit integers. */ +#if 8 / -3 == 2 +fail +#elif 8 / -3 == 3 +fail +#elif 8 / -3 == -2 +fail +#elif 8 / -3 == -3 +fail +#elif 8 / -3 == 0 +pass +#endif + +[preproc] +#if -8 / 3 == 2 +fail +#elif -8 / 3 == 3 +fail +#elif -8 / 3 == -2 +fail +#elif -8 / 3 == -3 +fail +#elif -8 / 3 == 1431655762 +pass +#endif + +[preproc] +#if 1 && 0 +fail +#endif +pass + +[preproc] +#if 0 && 1 +fail +#endif +pass + +[preproc] +#if 1 && 1 +pass +#endif + +[preproc] +#if 1 || 0 +pass +#endif + +[preproc] +#if 0 || 1 +pass +#endif + +[preproc] +#if 0 || 0 +fail +#endif +pass + +[preproc] +#if 1 != 1 +fail +#elif 1 != 0 +pass +#endif + +[preproc] +#if 2 < 1 +fail +#elif 2 < 2 +fail +#elif 1 < 2 +pass +#endif + +[preproc] +#if 2 <= 1 +fail +#elif (1 <= 1) && (1 <= 2) +pass +#endif + +[preproc] +#if 1 > 2 +fail +#elif 2 > 2 +fail +#elif 2 > 1 +pass +#endif + +[preproc] +#if 1 >= 2 +fail +#elif (1 >= 1) && (2 >= 1) +pass +#endif + +[preproc] +#if (2 == 2) == 1 +pass +#endif + +[preproc] +#if ((!0) == 1) && ((!1) == 0) && ((!2) == 0) +pass +#endif + +[preproc] +#if (0 ? 2 : 3) == 3 +pass +#endif + +[preproc] +#if (1 ? 2 : 3) == 2 +pass +#endif + +[preproc] +#if (6 & 3) == 2 +pass +#endif + +[preproc] +#if (6 | 3) == 7 +pass +#endif + +[preproc] +#if (6 ^ 3) == 5 +pass +#endif + +[preproc] +#if +1 == 1 +pass +#endif + +[preproc] +#if -(-1) == 1 +pass +#endif + +[preproc] +#if 2 + 3 * 5 == 17 +pass +#endif + +[preproc] +#if (2 + 3) * 5 == 25 +pass +#endif + +[preproc] +#if 0 \ +< \ +1 +pass +#endif

1 0

Zebediah Figura : tests: Add some tests for macro expansion.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: vkd3d Branch: master Commit: 5642fbaae7bd0444b2d94f5ced5ce43c3a08145c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5642fbaae7bd0444b2d94f5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 24 00:29:56 2020 -0600 tests: Add some tests for macro expansion. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 2 + tests/preproc-macro.shader_test | 303 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 305 insertions(+) diff --git a/Makefile.am b/Makefile.am index 2cb1567..59e054f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vkd3d_shader_tests = \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ + tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -212,6 +213,7 @@ XFAIL_TESTS = \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ + tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-macro.shader_test b/tests/preproc-macro.shader_test new file mode 100644 index 0000000..0fe73f7 --- /dev/null +++ b/tests/preproc-macro.shader_test @@ -0,0 +1,303 @@ +[preproc] +#define KEY pass +KEY + +[preproc] +#define KEY fail +pass + +[preproc] +#define KEY(a, b) a +KEY(pass, fail) + +[preproc] +/* Make sure argument expansion replaces the right tokens. */ +#define KEY(pass, fail) fail +KEY(fail, pass) + +[preproc] +#define KEY (pass) +KEY(a,b) + +[preproc] +#define FUNC(a) pass +#define LEFT FUNC( +LEFT fail) + +[preproc] +#define KEY(a, b) a +KEY( +pass +, +fail +) + +[preproc] +/* Function-like macros which cannot be expanded (due to argument count mismatch + * or other parse errors) emit only the macro name and nothing else. In the case + * of unterminated macro lists, nothing after the macro name is emitted. */ +#define pass(a, b) a b fail +pass(fail, fail +fail + +[preproc] +#define pass(a, b) fail +pass(fail, fail, fail) + +[preproc] +#define KEY(a, b) fail +KEY(fail, fail, fail) +pass + +[preproc] +#define pass(a, b) fail +pass +(a, b) + +[preproc] +#define FUNC(a) pass +#define KEY FUNC +KEY (fail) + +[preproc] +#define KEY(a, b) a ## b +KEY ( pa , ss ) + +[preproc] +#define KEY(a, b) pa ## ss +KEY(fail, fail) + +[preproc] +#define KEY(a) a ## ss +KEY(pa) + +[preproc] +#define KEY(a) pa ## a +KEY(ss) + +[preproc] +#define KEY(x) p \ + ## \ + x \ + ## \ + ss +KEY( +a +) + +[preproc] +/* Concatenation is only parsed if the macro has arguments. */ +#define KEY fa ## il +KEY pass + +[preproc] +#define KEY(a) a +KEY(pa ## ss) + +[preproc] +fa ## il +pass + +[preproc] +#define KEY1 KEY2 +#define KEY2 pass +KEY1 + +[preproc] +#define KEY2 pass +#define KEY1 KEY2 +KEY1 + +[preproc] +#define KEY fail +#undef KEY +KEY pass + +[preproc] +#define KEY(a,b) fail +#undef KEY +KEY(pass, pass) + +[preproc] +#define KEY1 KEY2 +#define KEY2 fail +#undef KEY2 +KEY1 pass + +[preproc] +#define KEY2 fail +#define KEY1 KEY2 +#undef KEY2 +KEY1 pass + +[preproc] +#define KEY1(a, b) a +#define KEY2 pass +#define KEY3 fail +KEY1(KEY2, KEY3) + +[preproc] +#define a b +#define KEY(a) b +KEY(fail) +pass + +[preproc] +#define a b +#define KEY(a) a +KEY(pass) + +[preproc] +#define OP== +#if 2 OP 3 +fail +#elif 2 OP 2 +pass +#endif + +[preproc] +#define KEY 1 +#if KEY == 1 +pass +#endif + +[preproc] +#define KEY(a, b) (a < b) +#if KEY(2, 1) +fail +#elif KEY(1, 2) +pass +#endif + +[preproc] +#define KEY fail +#define KEY pass +KEY + +[preproc] +/* Identifiers are not expanded in the LHS of #define statements. */ +#define KEY pass +#define KEY fail +pass + +[preproc] +#undef KEY +pass + +[preproc] +#define KEY(a, b) b +KEY("fail,fail",pass) + +[preproc] +#define \ +KEY( \ +a \ +, \ +b \ +) \ +a +KEY(pass, fail) + +[preproc] +#define \ +KEY \ +pass +KEY + +[preproc] +#define KEY(a, b) b +KEY(multiline +argument,pass) + +[preproc] +#define KEY(a, b) b +KEY( +multiline +#define fail pass +argument, fail) + +[preproc] +#define KEY(a, b) a +KEY((pass,pass),(fail,fail)) + +[preproc] +#define KEY(a, b) b +KEY((,,fail,,fail,,),(,,pass,,pass,,)) + +[preproc] +#define KEY(a, b) b +KEY([,,fail,,fail,,],[,,pass,,pass,,]) + +[preproc] +#define KEY(a, b) b +KEY({,,fail,,fail,,},{,,pass,,pass,,}) + +[preproc] +#define KEY(a, b) pass +KEY((),()) + +[preproc] +#define KEY(a, b) pass +KEY((,),(,)) + +[preproc] +/* Unbalanced parentheses result in an unterminated macro. */ +#define pass(a, b) fail +pass((),() + +[preproc] +#define KEY(a,a) a +KEY(pass,fail) + +[preproc] +/* Macro arguments suffer their own macro expansion only after the macro has + * been completely parsed. */ +#define KEY(a) a +KEY(fail +#define fail pass +) + +[preproc] +/* The same applies to #if. */ +#define KEY(a) a +KEY( +#define OBJ +#ifdef OBJ +pass +#endif +) + +[preproc] +#define KEY(a) a +KEY(pass +#ifdef OBJ +fail +#endif +#define OBJ +) + +[preproc] +/* Directives inside of macro arguments are always evaluated. */ +#define FUNC(a) value +FUNC(fail +#define KEY pass +) +KEY + +[preproc] +#define FUNC1(a) a ## ss +#define FUNC2(a, b) a < b + +FUNC1( +#if FUNC2(3, 2) +fail +#elif FUNC2(2, 3) +pa +#else +fail +#endif +) + +[preproc] +#define __LINE__ pass +__LINE__

1 0

Zebediah Figura : tests: Add some tests for shaders which fail to preprocess.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: vkd3d Branch: master Commit: 3bf15d6345b36fc4f6a9e142acbdf43453e263aa URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3bf15d6345b36fc4f6a9e14… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 24 00:29:57 2020 -0600 tests: Add some tests for shaders which fail to preprocess. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 2 ++ tests/preproc-invalid.shader_test | 8 ++++++++ tests/shader_runner_d3d12.c | 25 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/Makefile.am b/Makefile.am index 59e054f..ec82707 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,6 +67,7 @@ vkd3d_shader_tests = \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ + tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -213,6 +214,7 @@ XFAIL_TESTS = \ tests/preproc-if.shader_test \ tests/preproc-ifdef.shader_test \ tests/preproc-if-expr.shader_test \ + tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ diff --git a/tests/preproc-invalid.shader_test b/tests/preproc-invalid.shader_test new file mode 100644 index 0000000..8a30aad --- /dev/null +++ b/tests/preproc-invalid.shader_test @@ -0,0 +1,8 @@ +[preproc fail] +#error + +[preproc fail] +#include <nonexistent_file> + +[preproc fail] +#include "nonexistent_file" diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 39495fa..bf5c3e0 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -103,6 +103,7 @@ enum parse_state { STATE_NONE, STATE_PREPROC, + STATE_PREPROC_INVALID, STATE_SHADER_INVALID_PIXEL, STATE_SHADER_PIXEL, STATE_TEST, @@ -347,6 +348,27 @@ START_TEST(shader_runner_d3d12) break; } + case STATE_PREPROC_INVALID: + { + ID3D10Blob *blob = NULL, *errors = NULL; + HRESULT hr; + + hr = D3DPreprocess(shader_source, strlen(shader_source), NULL, NULL, NULL, &blob, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!blob, "Expected no compiled shader blob.\n"); + ok(!!errors, "Expected non-NULL error blob.\n"); + + if (errors) + { + if (vkd3d_test_state.debug_level) + trace("%s\n", (char *)ID3D10Blob_GetBufferPointer(errors)); + ID3D10Blob_Release(errors); + } + + shader_source_len = 0; + break; + } + case STATE_PREPROC: { ID3D10Blob *blob = NULL, *errors = NULL; @@ -389,6 +411,8 @@ START_TEST(shader_runner_d3d12) state = STATE_TEST; else if (!strcmp(line, "[preproc]\n")) state = STATE_PREPROC; + else if (!strcmp(line, "[preproc fail]\n")) + state = STATE_PREPROC_INVALID; vkd3d_test_set_context("Section %.*s, line %u", strlen(line) - 1, line, line_number); } @@ -402,6 +426,7 @@ START_TEST(shader_runner_d3d12) break; case STATE_PREPROC: + case STATE_PREPROC_INVALID: case STATE_SHADER_INVALID_PIXEL: case STATE_SHADER_PIXEL: {

1 0

Zebediah Figura : tests: Add some more miscellaneous preprocessor tests.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: vkd3d Branch: master Commit: e44f2fbf432f3ddb0db981155a41345ffb78c8fc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e44f2fbf432f3ddb0db9811… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 24 00:29:58 2020 -0600 tests: Add some more miscellaneous preprocessor tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/preproc-misc.shader_test | 80 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) diff --git a/Makefile.am b/Makefile.am index ec82707..fc0bad3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ vkd3d_shader_tests = \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ + tests/preproc-misc.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -216,6 +217,7 @@ XFAIL_TESTS = \ tests/preproc-if-expr.shader_test \ tests/preproc-invalid.shader_test \ tests/preproc-macro.shader_test \ + tests/preproc-misc.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/preproc-misc.shader_test b/tests/preproc-misc.shader_test new file mode 100644 index 0000000..f14c599 --- /dev/null +++ b/tests/preproc-misc.shader_test @@ -0,0 +1,80 @@ +[preproc] + # define KEY pass +KEY + +[preproc] +#if 0 +#error +#endif +pass + +[preproc] +#define pass fail +"pass" + +[preproc] +#define pass fail +" escape \" pass " + +[preproc] +#define fail pass +" escape \\" fail + +[preproc] +"multiline +string" +pass + +[preproc] +"multiline +pass" + +[preproc] +"pass +string" + +[preproc] +/* +#error +fail + * / fail*/pass + +[preproc] +pass/* +#error +fail + */ + +[preproc] +pass//fail + +[preproc] +// multiline comment \ +fail +pass + +[preproc] +fa/* */il +pass + +[preproc] +#define KEY // +KEY pass + +[preproc] +#define KEY /* fail */ pass +KEY + +[preproc] +#define KEY(a, b) /* multiline + +comment */ a +KEY(pass, fail) + +[preproc] +pass /* fail + +[preproc] +/* The backslash must be the last character in the line. */ +#define KEY \ +pass

1 0

Zebediah Figura : tests: Add some C HLSL preprocessor tests.
by Alexandre Julliard 24 Nov '20

24 Nov '20

Module: vkd3d Branch: master Commit: ffa7bd39f399c70c3c73775284cfc0587462ee9b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffa7bd39f399c70c3c73775… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Nov 24 00:29:59 2020 -0600 tests: Add some C HLSL preprocessor tests. That is, tests in C, for features of the HLSL preprocessor which are difficult to test using the shader_runner framework. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> 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> --- Makefile.am | 4 +- include/private/vkd3d_common.h | 14 ++ tests/.gitignore | 1 + tests/d3d12_crosstest.h | 1 + tests/hlsl_d3d12.c | 413 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 432 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=ffa7bd39f399c70c3c7…

1 0

Alexandre Julliard : kernel32: Implement BaseThreadInitThunk in assembly also for PE builds.
by Alexandre Julliard 23 Nov '20

23 Nov '20

Module: wine Branch: master Commit: d896b1195d876085f7127accd445c3ecd504da3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d896b1195d876085f7127acc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 23 13:58:27 2020 +0100 kernel32: Implement BaseThreadInitThunk in assembly also for PE builds. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50171 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/thread.c | 13 ++++++------- include/wine/asm.h | 12 +++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c index 1cd309d84b4..1f4f938af51 100644 --- a/dlls/kernel32/thread.c +++ b/dlls/kernel32/thread.c @@ -33,8 +33,11 @@ #include "kernel_private.h" +/*********************************************************************** + * BaseThreadInitThunk (KERNEL32.@) + */ #ifdef __i386__ -__ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, +__ASM_FASTCALL_FUNC( BaseThreadInitThunk, 12, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") @@ -50,16 +53,12 @@ __ASM_STDCALL_FUNC( __fastcall_BaseThreadInitThunk, 12, "call *%edx\n\t" "movl %eax,(%esp)\n\t" "call " __ASM_STDCALL( "RtlExitUserThread", 4 )) -#endif - -/*********************************************************************** - * BaseThreadInitThunk (KERNEL32.@) - */ +#else void __fastcall BaseThreadInitThunk( DWORD unknown, LPTHREAD_START_ROUTINE entry, void *arg ) { RtlExitUserThread( entry( arg ) ); } - +#endif /*********************************************************************** * FreeLibraryAndExitThread (KERNEL32.@) diff --git a/include/wine/asm.h b/include/wine/asm.h index 788e26126cb..2d1607ca772 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -28,9 +28,11 @@ #endif #if defined(_WIN32) && defined(__i386__) -# define __ASM_STDCALL(name,args) __ASM_NAME(name) "@" #args +# define __ASM_STDCALL(name,args) "_" name "@" #args +# define __ASM_FASTCALL(name,args) "@" name "@" #args #else -# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_STDCALL(name,args) __ASM_NAME(name) +# define __ASM_FASTCALL(name,args) __ASM_NAME("__fastcall_" name) #endif #if defined(__GCC_HAVE_DWARF2_CFI_ASM) || (defined(__clang__) && defined(__GNUC__) && !defined(__SEH__)) @@ -78,21 +80,21 @@ __ASM_BLOCK_END #define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(__ASM_NAME(#name),code) - #define __ASM_STDCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_STDCALL(#name,args),code) +#define __ASM_FASTCALL_FUNC(name,args,code) __ASM_DEFINE_FUNC(__ASM_FASTCALL(#name,args),code) /* fastcall support */ #if defined(__i386__) && !defined(_WIN32) # define DEFINE_FASTCALL1_WRAPPER(func) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, 4, \ + __ASM_FASTCALL_FUNC( func, 4, \ "popl %eax\n\t" \ "pushl %ecx\n\t" \ "pushl %eax\n\t" \ "jmp " __ASM_STDCALL(#func,4) ) # define DEFINE_FASTCALL_WRAPPER(func,args) \ - __ASM_STDCALL_FUNC( __fastcall_ ## func, args, \ + __ASM_FASTCALL_FUNC( func, args, \ "popl %eax\n\t" \ "pushl %edx\n\t" \ "pushl %ecx\n\t" \

1 0