May 2024 - Wine-commits - list.winehq.org

Elizabeth Figura : wined3d: Remove the no longer needed fragment_caps.proj_control flag.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 1e2d2b29c75732b69df0c5da6ef8f13216fb0f07 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e2d2b29c75732b69df0c5da6ef8f1… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 17:29:44 2024 -0500 wined3d: Remove the no longer needed fragment_caps.proj_control flag. --- dlls/wined3d/glsl_shader.c | 1 - dlls/wined3d/utils.c | 120 ++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 34 insertions(+), 88 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bf6f49d3f62..24bbe1cc6a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12132,7 +12132,6 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; memset(caps, 0, sizeof(*caps)); - caps->proj_control = true; caps->srgb_write = true; caps->color_key = true; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 642c5e64eee..91355438378 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5701,7 +5701,7 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w /* Setup this textures matrix according to the texture flags. */ static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, - BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) + BOOL transformed, enum wined3d_format_id format_id, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; @@ -5719,92 +5719,41 @@ static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t mat = *matrix; - if (flags & WINED3D_TTFF_PROJECTED) + /* Under Direct3D the R/Z coord can be used for translation, under + * OpenGL we use the Q coord instead. */ + if (!(flags & WINED3D_TTFF_PROJECTED) && !calculated_coords) { - if (!ffp_proj_control) + switch (format_id) { - switch (flags & ~WINED3D_TTFF_PROJECTED) - { - case WINED3D_TTFF_COUNT2: - mat._14 = mat._12; - mat._24 = mat._22; - mat._34 = mat._32; - mat._44 = mat._42; - mat._12 = mat._22 = mat._32 = mat._42 = 0.0f; - break; - case WINED3D_TTFF_COUNT3: - mat._14 = mat._13; - mat._24 = mat._23; - mat._34 = mat._33; - mat._44 = mat._43; - mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; - break; - } - } - } - else - { - /* Under Direct3D the R/Z coord can be used for translation, under - * OpenGL we use the Q coord instead. */ - if (!calculated_coords) - { - switch (format_id) - { - /* Direct3D passes the default 1.0 in the 2nd coord, while GL - * passes it in the 4th. Swap 2nd and 4th coord. No need to - * store the value of mat._41 in mat._21 because the input - * value to the transformation will be 0, so the matrix value - * is irrelevant. */ - case WINED3DFMT_R32_FLOAT: - mat._41 = mat._21; - mat._42 = mat._22; - mat._43 = mat._23; - mat._44 = mat._24; - break; - /* See above, just 3rd and 4th coord. */ - case WINED3DFMT_R32G32_FLOAT: - mat._41 = mat._31; - mat._42 = mat._32; - mat._43 = mat._33; - mat._44 = mat._34; - break; - case WINED3DFMT_R32G32B32_FLOAT: /* Opengl defaults match dx defaults */ - case WINED3DFMT_R32G32B32A32_FLOAT: /* No defaults apply, all app defined */ + /* Direct3D passes the default 1.0 in the 2nd coord, while GL + * passes it in the 4th. Swap 2nd and 4th coord. No need to + * store the value of mat._41 in mat._21 because the input + * value to the transformation will be 0, so the matrix value + * is irrelevant. */ + case WINED3DFMT_R32_FLOAT: + mat._41 = mat._21; + mat._42 = mat._22; + mat._43 = mat._23; + mat._44 = mat._24; + break; + /* See above, just 3rd and 4th coord. */ + case WINED3DFMT_R32G32_FLOAT: + mat._41 = mat._31; + mat._42 = mat._32; + mat._43 = mat._33; + mat._44 = mat._34; + break; + case WINED3DFMT_R32G32B32_FLOAT: /* Opengl defaults match dx defaults */ + case WINED3DFMT_R32G32B32A32_FLOAT: /* No defaults apply, all app defined */ - /* This is to prevent swapping the matrix lines and put the default 4th coord = 1.0 - * into a bad place. The division elimination below will apply to make sure the - * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 - */ - case WINED3DFMT_UNKNOWN: /* No texture coords, 0/0/0/1 defaults are passed */ - break; - default: - FIXME("Unexpected fixed function texture coord input\n"); - } - } - if (!ffp_proj_control) - { - switch (flags & ~WINED3D_TTFF_PROJECTED) - { - /* case WINED3D_TTFF_COUNT1: Won't ever get here. */ - case WINED3D_TTFF_COUNT2: - mat._13 = mat._23 = mat._33 = mat._43 = 0.0f; - /* OpenGL divides the first 3 vertex coordinates by the 4th by - * default, which is essentially the same as D3DTTFF_PROJECTED. - * Make sure that the 4th coordinate evaluates to 1.0 to - * eliminate that. - * - * If the fixed function pipeline is used, the 4th value - * remains unused, so there is no danger in doing this. With - * vertex shaders we have a problem. Should an application hit - * that problem, the code here would have to check for pixel - * shaders, and the shader has to undo the default GL divide. - * - * A more serious problem occurs if the application passes 4 - * coordinates in, and the 4th is != 1.0 (OpenGL default). - * This would have to be fixed with immediate mode draws. */ - default: - mat._14 = mat._24 = mat._34 = 0.0f; mat._44 = 1.0f; - } + /* This is to prevent swapping the matrix lines and put the default 4th coord = 1.0 + * into a bad place. The division elimination below will apply to make sure the + * 1.0 doesn't do anything bad. The caller will set this value if the stride is 0 + */ + case WINED3DFMT_UNKNOWN: /* No texture coords, 0/0/0/1 defaults are passed */ + break; + default: + FIXME("Unexpected fixed function texture coord input\n"); } } @@ -5824,8 +5773,7 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine generated, context->stream_info.position_transformed, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx)) ? context->stream_info.elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->id - : WINED3DFMT_UNKNOWN, - context->d3d_info->ffp_fragment_caps.proj_control, mat); + : WINED3DFMT_UNKNOWN, mat); } void get_pointsize_minmax(const struct wined3d_context *context, const struct wined3d_state *state, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 96762351f21..1c70b65dd8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -197,7 +197,6 @@ struct fragment_caps unsigned int TextureOpCaps; unsigned int max_blend_stages; unsigned int max_textures; - bool proj_control; bool srgb_write; bool color_key; };

1 0

Elizabeth Figura : d3d9/tests: Remove leftover debugging code.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 91d57e36565dcd4d91f67737b6fd7b49e53eb329 URL: https://gitlab.winehq.org/wine/wine/-/commit/91d57e36565dcd4d91f67737b6fd7b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed May 15 12:14:48 2024 -0500 d3d9/tests: Remove leftover debugging code. --- dlls/d3d9/tests/visual.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 367c8a9a955..600a6296c70 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12428,9 +12428,6 @@ stop: release_surface_readback(&rb); - IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - Sleep(50); - winetest_pop_context(); } IDirect3DDevice9_SetVertexShader(device, NULL);

1 0

Jacek Caban : d3d9/tests: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: d30bd3a1f0151d1f03036fe1f840ebf6f4cc7d95 URL: https://gitlab.winehq.org/wine/wine/-/commit/d30bd3a1f0151d1f03036fe1f840eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:15:10 2024 +0200 d3d9/tests: Use GNU assembly syntax on clang x86_64 MSVC target. Also fix unused dummy_object_vtbl variable warnings on targets skipping the test. --- dlls/d3d9/tests/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9d92b248dd9..53dc9ee55ed 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4906,28 +4906,34 @@ cleanup: } +static const GUID d3d9_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + static inline void set_fpu_cw(WORD cw) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D9_TEST_SET_FPU_CW 1 - __asm__ volatile ("fnclex"); - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D9_TEST_SET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnclex; __asm fldcw cw; +#else + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); #endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D9_TEST_GET_FPU_CW 1 - __asm__ volatile ("fnstcw %0" : "=m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D9_TEST_GET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnstcw cw; +#else + __asm__ volatile ("fnstcw %0" : "=m" (cw)); #endif return cw; } @@ -4964,17 +4970,8 @@ static const IUnknownVtbl dummy_object_vtbl = dummy_object_Release, }; -static const GUID d3d9_private_data_test_guid = -{ - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} -}; - static void test_fpu_setup(void) { -#if defined(D3D9_TEST_SET_FPU_CW) && defined(D3D9_TEST_GET_FPU_CW) static const BOOL is_64bit = sizeof(void *) > sizeof(int); IUnknown dummy_object = {&dummy_object_vtbl}; struct device_desc device_desc; @@ -5079,9 +5076,16 @@ static void test_fpu_setup(void) done: IDirect3D9_Release(d3d9); DestroyWindow(window); -#endif } +#else + +static void test_fpu_setup(void) +{ +} + +#endif + static void test_window_style(void) { RECT focus_rect, device_rect, fullscreen_rect, r, r2;

1 0

Jacek Caban : d3d8/tests: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: e972f3369d55334923a86ba9c71edef35922d670 URL: https://gitlab.winehq.org/wine/wine/-/commit/e972f3369d55334923a86ba9c71ede… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:19:59 2024 +0200 d3d8/tests: Use GNU assembly syntax on clang x86_64 MSVC target. Also fix unused dummy_object_vtbl variable warnings on targets skipping the test. --- dlls/d3d8/tests/device.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 108895e4d02..8261a3139c5 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3701,28 +3701,34 @@ done: UnregisterClassA("d3d8_test_wndproc_wc", GetModuleHandleA(NULL)); } +static const GUID d3d8_private_data_test_guid = +{ + 0xfdb37466, + 0x428f, + 0x4edf, + {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} +}; + +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + static inline void set_fpu_cw(WORD cw) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D8_TEST_SET_FPU_CW 1 - __asm__ volatile ("fnclex"); - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D8_TEST_SET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnclex; __asm fldcw cw; +#else + __asm__ volatile ("fnclex"); + __asm__ volatile ("fldcw %0" : : "m" (cw)); #endif } static inline WORD get_fpu_cw(void) { WORD cw = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) -#define D3D8_TEST_GET_FPU_CW 1 - __asm__ volatile ("fnstcw %0" : "=m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) -#define D3D8_TEST_GET_FPU_CW 1 +#if defined(_MSC_VER) && defined(__i386__) __asm fnstcw cw; +#else + __asm__ volatile ("fnstcw %0" : "=m" (cw)); #endif return cw; } @@ -3759,17 +3765,8 @@ static const IUnknownVtbl dummy_object_vtbl = dummy_object_Release, }; -static const GUID d3d8_private_data_test_guid = -{ - 0xfdb37466, - 0x428f, - 0x4edf, - {0xa3,0x7f,0x9b,0x1d,0xf4,0x88,0xc5,0xfc} -}; - static void test_fpu_setup(void) { -#if defined(D3D8_TEST_SET_FPU_CW) && defined(D3D8_TEST_GET_FPU_CW) struct device_desc device_desc; IDirect3DDevice8 *device; IDirect3D8 *d3d8; @@ -3869,9 +3866,16 @@ static void test_fpu_setup(void) done: DestroyWindow(window); IDirect3D8_Release(d3d8); -#endif } +#else + +static void test_fpu_setup(void) +{ +} + +#endif + static void test_ApplyStateBlock(void) { IDirect3DDevice8 *device;

1 0

Jacek Caban : d3d9: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 920804604836433004ebac198068635360752d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/920804604836433004ebac19806863… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:23:10 2024 +0200 d3d9: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/d3d9/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 31dffbf4b60..c3cecc4e27f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -4614,16 +4614,16 @@ static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = static void setup_fpu(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - WORD cw; - __asm__ volatile ("fnstcw %0" : "=m" (cw)); - cw = (cw & ~0xf3f) | 0x3f; - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) WORD cw; __asm fnstcw cw; cw = (cw & ~0xf3f) | 0x3f; __asm fldcw cw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + WORD cw; + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); #else FIXME("FPU setup not implemented for this platform.\n"); #endif

1 0

Jacek Caban : d3d8: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: fe6801930e3549fdeae72f7b061bff78d0ca8a36 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe6801930e3549fdeae72f7b061bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:23:41 2024 +0200 d3d8: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/d3d8/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9be6436f8b4..401677e8261 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3649,16 +3649,16 @@ static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = static void setup_fpu(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - WORD cw; - __asm__ volatile ("fnstcw %0" : "=m" (cw)); - cw = (cw & ~0xf3f) | 0x3f; - __asm__ volatile ("fldcw %0" : : "m" (cw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) WORD cw; __asm fnstcw cw; cw = (cw & ~0xf3f) | 0x3f; __asm fldcw cw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + WORD cw; + __asm__ volatile ("fnstcw %0" : "=m" (cw)); + cw = (cw & ~0xf3f) | 0x3f; + __asm__ volatile ("fldcw %0" : : "m" (cw)); #else FIXME("FPU setup not implemented for this platform.\n"); #endif

1 0

Jacek Caban : ddraw: Use GNU assembly syntax on clang x86_64 MSVC target.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: eca2e8bf6cd99e0daffd0b49a852e86adaa13417 URL: https://gitlab.winehq.org/wine/wine/-/commit/eca2e8bf6cd99e0daffd0b49a852e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:25:37 2024 +0200 ddraw: Use GNU assembly syntax on clang x86_64 MSVC target. --- dlls/ddraw/device.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index eb1ad90ee0f..896eea68f14 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -42,10 +42,10 @@ const GUID IID_D3DDEVICE_WineD3D = { static inline void set_fpu_control_word(WORD fpucw) { -#if defined(__i386__) && defined(__GNUC__) - __asm__ volatile ("fldcw %0" : : "m" (fpucw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) __asm fldcw fpucw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + __asm__ volatile ("fldcw %0" : : "m" (fpucw)); #endif } @@ -53,10 +53,10 @@ static inline WORD d3d_fpu_setup(void) { WORD oldcw; -#if defined(__i386__) && defined(__GNUC__) - __asm__ volatile ("fnstcw %0" : "=m" (oldcw)); -#elif defined(__i386__) && defined(_MSC_VER) +#if defined(__i386__) && defined(_MSC_VER) __asm fnstcw oldcw; +#elif defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__) && (defined(__GNUC__) || defined(__clang__))) + __asm__ volatile ("fnstcw %0" : "=m" (oldcw)); #else static BOOL warned = FALSE; if(!warned)

1 0

Alexandre Julliard : wbemprox: Avoid unused function warning.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: badaed641928edb8f2426d9f12d16c88b479e1e8 URL: https://gitlab.winehq.org/wine/wine/-/commit/badaed641928edb8f2426d9f12d16c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 18:20:17 2024 +0200 wbemprox: Avoid unused function warning. --- dlls/wbemprox/wql.y | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index ba33396ddeb..541cd2450f0 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -299,6 +299,7 @@ associatorsof: } PARSER_BUBBLE_UP_VIEW( parser, $$, view ); + (void)yysymbol_name; /* avoid unused function warning */ } | TK_ASSOCIATORS TK_OF path TK_WHERE keywordlist {

1 0

Victor Chiletto : vkd3d-shader/preproc: Treat CR as whitespace.
by Alexandre Julliard 23 May '24

23 May '24

Module: vkd3d Branch: master Commit: 105ef282736090c034599ecbe5abca56ea6d05a1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/105ef282736090c034599ecbe5abc… Author: Victor Chiletto <vchiletto(a)codeweavers.com> Date: Wed May 22 14:07:00 2024 -0300 vkd3d-shader/preproc: Treat CR as whitespace. --- libs/vkd3d-shader/preproc.l | 2 +- tests/hlsl_d3d12.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index d360f6ca..be50d3b9 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -65,7 +65,7 @@ static void update_location(struct preproc_ctx *ctx); %s LINE NEWLINE \r?\n -WS [ \t] +WS [ \t\r] IDENTIFIER [A-Za-z_][A-Za-z0-9_]* INT_SUFFIX [uUlL]{0,2} diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 8d5d8d90..215d624a 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -379,6 +379,18 @@ static void test_preprocess(void) "pass", "fail", }, + + /* CRs are treated as whitespace. */ + { + "#define\rKEY(a,\rb)\ra##b\r\n" + "KEY(pa,\rss)\r\n" + "#ifndef\rKEY\r\n" + "fail\r\n" + "#endif\r\n", + + "pass", + "fail", + } }; for (i = 0; i < ARRAY_SIZE(tests); ++i)

1 0

Alexandre Julliard : msvcp/tests: Fix mangled names on ARM.
by Alexandre Julliard 23 May '24

23 May '24

Module: wine Branch: master Commit: 57bb483be85adbfcc6e39f317cd10da8cf47ee5f URL: https://gitlab.winehq.org/wine/wine/-/commit/57bb483be85adbfcc6e39f317cd10d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 23 12:20:35 2024 +0200 msvcp/tests: Fix mangled names on ARM. --- dlls/msvcp120/tests/msvcp120.c | 2 +- dlls/msvcp140/tests/msvcp140.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index f3cce632f51..c7de814a384 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -769,7 +769,7 @@ static BOOL init(void) SET(p_vector_base_v4__Internal_reserve, "?_Internal_reserve(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXIII(a)Z"); SET(p_vector_base_v4__Internal_resize, - "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); + "?_Internal_resize(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXIIIP6AXPAXI(a)ZP6AX0PBXI@Z2(a)Z"); #endif } SET(p__Thrd_equal, diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8966820f599..faf4c214801 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -299,7 +299,7 @@ static BOOL init(void) SET(p__ContextCallback__Capture, "?_Capture(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); SET(p__ContextCallback__Reset, "?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ"); SET(p__TaskEventLogger__LogCancelTask, "?_LogCancelTask(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); - SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAEX_N(a)Z"); + SET(p__TaskEventLogger__LogScheduleTask, "?_LogScheduleTask(a)_TaskEventLogger@details(a)Concurrency@@QAAX_N(a)Z@Z"); SET(p__TaskEventLogger__LogTaskCompleted, "?_LogTaskCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); SET(p__TaskEventLogger__LogTaskExecutionCompleted, "?_LogTaskExecutionCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ"); SET(p__TaskEventLogger__LogWorkItemCompleted, "?_LogWorkItemCompleted(a)_TaskEventLogger@details(a)Concurrency@@QAAXXZ");

1 0