November 2020 - Wine-Commits

Michael Stefaniuc : jscript: Use wide-char string literals.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

Module: wine Branch: master Commit: 59b9747644a0c8692bd0d47169a0ab0dbc308847 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b9747644a0c8692bd0d471… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:04 2020 +0100 jscript: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/activex.c | 4 +- dlls/jscript/bool.c | 9 +-- dlls/jscript/compile.c | 4 +- dlls/jscript/date.c | 65 ++++++------------- dlls/jscript/dispex.c | 15 ++--- dlls/jscript/engine.c | 35 ++++------ dlls/jscript/enumerator.c | 6 +- dlls/jscript/error.c | 35 +++------- dlls/jscript/function.c | 44 ++++--------- dlls/jscript/global.c | 78 ++++++++--------------- dlls/jscript/json.c | 27 +++----- dlls/jscript/jsregexp.c | 27 +++----- dlls/jscript/jsstr.c | 6 +- dlls/jscript/jsutils.c | 19 ++---- dlls/jscript/lex.c | 4 +- dlls/jscript/number.c | 7 +- dlls/jscript/string.c | 159 +++++++++++++++------------------------------- dlls/jscript/vbarray.c | 4 +- 18 files changed, 167 insertions(+), 381 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=59b9747644a0c8692bd0…

1 0

Michael Stefaniuc : mshtml: Use wide-char string literals for PRUnichar strings.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

Module: wine Branch: master Commit: 33de9b1475edf566866d91818e0af2c453f99027 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33de9b1475edf566866d9181… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 24 00:49:06 2020 +0100 mshtml: Use wide-char string literals for PRUnichar strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/editor.c | 7 ++----- dlls/mshtml/htmldoc.c | 4 +--- dlls/mshtml/htmlelemcol.c | 4 +--- dlls/mshtml/htmlform.c | 8 ++------ dlls/mshtml/htmlhead.c | 9 +++------ dlls/mshtml/htmlimg.c | 4 +--- dlls/mshtml/htmlselect.c | 4 +--- dlls/mshtml/nsevents.c | 21 ++++++++------------- dlls/mshtml/nsservice.c | 8 +++----- dlls/mshtml/olecmd.c | 14 ++++++-------- dlls/mshtml/pluginhost.c | 18 +++++------------- dlls/mshtml/range.c | 7 ++----- dlls/mshtml/script.c | 8 ++------ 13 files changed, 37 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=33de9b1475edf566866d…

1 0

Brendan Shanks : winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

Module: wine Branch: master Commit: 9c0c0e2b57e0a5e27a1e0a8d1d2ca4660a0e4a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c0c0e2b57e0a5e27a1e0a8d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Nov 23 16:48:44 2020 -0800 winebus.sys: Open IOHID devices individually to fix macOS Catalina and Big Sur. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50153 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index df578b4b9d6..ee6225bf398 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -297,6 +297,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * if (str) CFStringToWSTR(str, serial_string, ARRAY_SIZE(serial_string)); uid = CFNumberToDWORD(IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDLocationIDKey))); + if (IOHIDDeviceOpen(IOHIDDevice, 0) != kIOReturnSuccess) + { + ERR("Failed to open HID device %p (vid %04x, pid %04x)\n", IOHIDDevice, vid, pid); + return; + } + IOHIDDeviceScheduleWithRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) { @@ -365,6 +372,8 @@ static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL); /* Note: Yes, we leak the buffer. But according to research there is no safe way to deallocate that buffer. */ + IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode); + IOHIDDeviceClose(IOHIDDevice, 0); device = bus_find_hid_device(&iohid_vtbl, IOHIDDevice); if (device) { @@ -383,13 +392,6 @@ static DWORD CALLBACK runloop_thread(void *args) IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, handle_DeviceMatchingCallback, NULL); IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, handle_RemovalCallback, NULL); IOHIDManagerScheduleWithRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - if (IOHIDManagerOpen( hid_manager, 0 ) != kIOReturnSuccess) - { - ERR("Couldn't open IOHIDManager.\n"); - IOHIDManagerUnscheduleFromRunLoop(hid_manager, run_loop, kCFRunLoopDefaultMode); - CFRelease(hid_manager); - return 0; - } CFRunLoopRun(); TRACE("Run Loop exiting\n");

1 0

Zebediah Figura : quartz: Avoid autoplugging renderers in IGraphBuilder::Connect().
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

Module: wine Branch: master Commit: 68d355883016d88fbb6c1aad9ee131e0c0457c47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68d355883016d88fbb6c1aad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Nov 24 00:18:01 2020 -0600 quartz: Avoid autoplugging renderers in IGraphBuilder::Connect(). I don't know of an application that this helps, but it seems like an optimization worth performing. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index cf2421f64e2..58038829217 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1397,7 +1397,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *source, I EnterCriticalSection(&graph->cs); - hr = autoplug(graph, source, sink, FALSE, 0); + hr = autoplug(graph, source, sink, TRUE, 0); LeaveCriticalSection(&graph->cs);

1 0

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

Nov. 24, 2020

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 C HLSL preprocessor tests.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

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

Zebediah Figura : tests: Add some more miscellaneous preprocessor tests.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

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 tests for #if expression evaluation.
by Alexandre Julliard Nov. 24, 2020

Nov. 24, 2020

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 Nov. 24, 2020

Nov. 24, 2020

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

Piotr Caban : msvcrt: Remove traces from printf.
by Alexandre Julliard Nov. 23, 2020

Nov. 23, 2020

Module: wine Branch: master Commit: 1b053519755242a561feec91df4a60f07c322c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b053519755242a561feec91… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 23 14:01:27 2020 +0100 msvcrt: Remove traces from printf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index f8b200c7e54..3be60db369b 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -601,8 +601,6 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floating point argument: %.16le\n", v); - if(flags->Precision == -1) flags->Precision = 6; @@ -973,8 +971,6 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API BOOL standard_rounding = FALSE; #endif - TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); - if (!MSVCRT_CHECK_PMT(fmt != NULL)) return -1;

1 0