February 2022 - Wine-Commits

Matteo Bruni : d3dcompiler: Move skip_u32_unknown() declaration to utils.h.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: a149fd4a56ee70d87c3c81859231971b1164adb9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a149fd4a56ee70d87c3c8185… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:10 2022 +0100 d3dcompiler: Move skip_u32_unknown() declaration to utils.h. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 -- dlls/d3dcompiler_43/d3dcompiler_private.h | 2 -- dlls/d3dcompiler_43/utils.h | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 9aabc2028e6..71037c740e0 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -312,8 +312,6 @@ struct d3d10_effect HRESULT d3d10_effect_parse(struct d3d10_effect *effect, const void *data, SIZE_T data_size) DECLSPEC_HIDDEN; -void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; - /* D3D10Core */ HRESULT WINAPI D3D10CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapter, unsigned int flags, D3D_FEATURE_LEVEL feature_level, ID3D10Device **device); diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 08cdb515470..6dea5a08a85 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -575,6 +575,4 @@ static inline void write_u32(char **ptr, uint32_t u32) *ptr += sizeof(u32); } -void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; - #endif /* __WINE_D3DCOMPILER_PRIVATE_H */ diff --git a/dlls/d3dcompiler_43/utils.h b/dlls/d3dcompiler_43/utils.h index fdb7f8e8db4..5259c057f6e 100644 --- a/dlls/d3dcompiler_43/utils.h +++ b/dlls/d3dcompiler_43/utils.h @@ -30,4 +30,6 @@ static inline uint32_t read_u32(const char **ptr) return r; } +void skip_u32_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; + #endif /* __WINE_UTILS_H */

1 0

Matteo Bruni : d3dcompiler: Move read_u32() to a new utils.h private header.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 8c29458630e734db63669155dad2a14f43aeaebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c29458630e734db63669155… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:08 2022 +0100 d3dcompiler: Move read_u32() to a new utils.h private header. To be able to use it from d3d10 via PARENTSRC. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 10 +--------- dlls/d3dcompiler_43/utils.h | 33 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 791c8d1cad2..08cdb515470 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -33,6 +33,7 @@ #include "objbase.h" #include "d3dcompiler.h" +#include "utils.h" #include <assert.h> #include <stdint.h> @@ -568,15 +569,6 @@ HRESULT dxbc_parse(const char *data, SIZE_T data_size, struct dxbc *dxbc) DECLSP HRESULT dxbc_add_section(struct dxbc *dxbc, DWORD tag, const char *data, size_t data_size) DECLSPEC_HIDDEN; HRESULT dxbc_init(struct dxbc *dxbc, unsigned int size) DECLSPEC_HIDDEN; -static inline uint32_t read_u32(const char **ptr) -{ - uint32_t r; - - memcpy(&r, *ptr, sizeof(r)); - *ptr += sizeof(r); - return r; -} - static inline void write_u32(char **ptr, uint32_t u32) { memcpy(*ptr, &u32, sizeof(u32)); diff --git a/dlls/d3dcompiler_43/utils.h b/dlls/d3dcompiler_43/utils.h new file mode 100644 index 00000000000..fdb7f8e8db4 --- /dev/null +++ b/dlls/d3dcompiler_43/utils.h @@ -0,0 +1,33 @@ +/* + * Copyright 2022 Matteo Bruni for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_UTILS_H +#define __WINE_UTILS_H + +#include <stdint.h> + +static inline uint32_t read_u32(const char **ptr) +{ + uint32_t r; + + memcpy(&r, *ptr, sizeof(r)); + *ptr += sizeof(r); + return r; +} + +#endif /* __WINE_UTILS_H */

1 0

Matteo Bruni : d3dcompiler: Use more consistent integer data types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: c4273f0bbef5262775365996c38a8a980567e8e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4273f0bbef5262775365996… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:05 2022 +0100 d3dcompiler: Use more consistent integer data types. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/asmparser.c | 968 ++++++++++++---------- dlls/d3dcompiler_43/asmshader.y | 68 +- dlls/d3dcompiler_43/bytecodewriter.c | 1257 ++++++++++++++++------------- dlls/d3dcompiler_43/compiler.c | 7 +- dlls/d3dcompiler_43/d3dcompiler_private.h | 141 ++-- dlls/d3dcompiler_43/reflection.c | 344 ++++---- dlls/d3dcompiler_43/utils.c | 154 ++-- 7 files changed, 1570 insertions(+), 1369 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c4273f0bbef526277536…

1 0

Matteo Bruni : winhttp/tests: Fix typo in an ok() message.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: f94d378236e61f8089b1ac31ca4b2ed3622c1f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f94d378236e61f8089b1ac31… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:04 2022 +0100 winhttp/tests: Fix typo in an ok() message. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 354c85c6d28..35f6bc5cf26 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -5116,7 +5116,7 @@ static void test_chunked_read(void) header[0] = 0; len = sizeof(header); ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); - ok( ret, "failed to get TRANSFER_ENCODING header (error %lu\n", GetLastError() ); + ok( ret, "failed to get TRANSFER_ENCODING header with error %lu\n", GetLastError() ); ok( !lstrcmpW( header, L"chunked" ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); trace( "transfer encoding: %s\n", wine_dbgstr_w(header) );

1 0

Zebediah Figura : d3dx9: Don't mark annotation variables as dirty.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 47351a609d71016f376b29aae09952d87aa0df95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47351a609d71016f376b29aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:24:34 2022 -0600 d3dx9: Don't mark annotation variables as dirty. This fixes a crash when trying to set their value. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b8c957245a6..310e5c0bf17 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1313,10 +1313,15 @@ static void *record_parameter(struct d3dx_effect *effect, struct d3dx_parameter static void set_dirty(struct d3dx_parameter *param) { - struct d3dx_shared_data *shared_data; struct d3dx_top_level_parameter *top_param = param->top_level_param; - ULONG64 new_update_version = next_update_version(top_param->version_counter); + struct d3dx_shared_data *shared_data; + ULONG64 new_update_version; + + /* This is true for annotations. */ + if (!top_param) + return; + new_update_version = next_update_version(top_param->version_counter); if ((shared_data = top_param->shared_data)) shared_data->update_version = new_update_version; else

1 0

Stefan Dösinger : include: Remove an incorrect InterlockedCompareExchange128 function.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 2f7c6659991e608f2e34b607c088b695c9e9b540 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7c6659991e608f2e34b607… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 1 16:58:22 2022 +0300 include: Remove an incorrect InterlockedCompareExchange128 function. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 698f29d990e..bd64b092369 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6500,10 +6500,6 @@ static FORCEINLINE void MemoryBarrier(void) #pragma intrinsic(_InterlockedCompareExchange128) unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); -static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ - return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); -} #else

1 0

Matteo Bruni : d3d10: Use read_u32() implementation from d3dcompiler.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 0587b0eb9cfded3694afbe68e683afc2cae6045a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0587b0eb9cfded3694afbe68… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:09 2022 +0100 d3d10: Use read_u32() implementation from d3dcompiler. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 85f7bd51c97..9aabc2028e6 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -33,6 +33,7 @@ #include "d3d10.h" #include "d3dcompiler.h" +#include "utils.h" /* * This doesn't belong here, but for some functions it is possible to return that value, diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index df1c899e005..9ed964e1072 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -837,16 +837,6 @@ static BOOL d3d_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, S return TRUE; } -static uint32_t read_u32(const char **ptr) -{ - uint32_t u32; - - memcpy(&u32, *ptr, sizeof(u32)); - *ptr += sizeof(u32); - - return u32; -} - static BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { return !count || (data_size - offset) / count >= size;

1 0

Matteo Bruni : d3d10: Get rid of a comment.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 812ab92877c14c3411a18c447bdfbcaa2506dd16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=812ab92877c14c3411a18c44… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:06 2022 +0100 d3d10: Get rid of a comment. It's become more confusing than helpful I feel like. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index bb105beee6d..78f364d24b6 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1278,8 +1278,8 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse return E_FAIL; } - /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ - if (!dxbc_size) return S_OK; + if (!dxbc_size) + return S_OK; if (FAILED(hr = D3D10ReflectShader(ptr, dxbc_size, &v->u.shader.reflection))) return hr;

1 0

Eric Pouech : xapofx1_1: Enable compilation with long types.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 1ffde8b1c76817e59bf2de0670312e51f3414671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ffde8b1c76817e59bf2de06… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 7 23:09:51 2022 +0100 xapofx1_1: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xapofx1_1/Makefile.in | 2 +- dlls/xapofx1_2/Makefile.in | 2 +- dlls/xapofx1_3/Makefile.in | 2 +- dlls/xapofx1_4/Makefile.in | 2 +- dlls/xapofx1_5/Makefile.in | 2 +- dlls/xaudio2_0/Makefile.in | 2 +- dlls/xaudio2_1/Makefile.in | 2 +- dlls/xaudio2_2/Makefile.in | 2 +- dlls/xaudio2_3/Makefile.in | 2 +- dlls/xaudio2_4/Makefile.in | 2 +- dlls/xaudio2_5/Makefile.in | 2 +- dlls/xaudio2_6/Makefile.in | 2 +- dlls/xaudio2_7/Makefile.in | 2 +- dlls/xaudio2_7/xapo.c | 8 ++++---- dlls/xaudio2_7/xapofx.c | 6 +++--- dlls/xaudio2_7/xaudio_dll.c | 10 +++++----- dlls/xaudio2_8/Makefile.in | 2 +- dlls/xaudio2_9/Makefile.in | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1ffde8b1c76817e59bf2…

1 0

Zebediah Figura : d3dx9/tests: Test setting annotation values.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: ffc4d9b84cbb3895b87cc92ef942e28795f605b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffc4d9b84cbb3895b87cc92e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:24:35 2022 -0600 d3dx9/tests: Test setting annotation values. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index d4efc1101d9..63321fba3b3 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -8075,6 +8075,38 @@ static void test_effect_parameter_block(void) HWND window; HRESULT hr; + static const DWORD annotation_code[] = + { +#if 0 + float f <float a = 1.0;>; + + float4 vs_main(float4 pos : POSITION) : POSITION + { + return pos; + } + + technique tech0 + { + pass p + { + VertexShader = compile vs_2_0 vs_main(); + } + } +#endif + 0xfeff0901, 0x00000080, 0x00000000, 0x00000003, 0x00000000, 0x0000004c, 0x00000000, 0x00000000, + 0x00000001, 0x00000001, 0x00000000, 0x3f800000, 0x00000003, 0x00000000, 0x00000044, 0x00000000, + 0x00000000, 0x00000001, 0x00000001, 0x00000002, 0x00000061, 0x00000002, 0x00000066, 0x00000001, + 0x00000010, 0x00000004, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000070, 0x00000006, + 0x68636574, 0x00000030, 0x00000001, 0x00000001, 0x00000002, 0x00000002, 0x00000004, 0x00000020, + 0x00000000, 0x00000001, 0x00000028, 0x00000024, 0x00000074, 0x00000000, 0x00000001, 0x0000006c, + 0x00000000, 0x00000001, 0x00000092, 0x00000000, 0x00000058, 0x00000054, 0x00000000, 0x00000001, + 0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x00000074, 0xfffe0200, 0x0014fffe, + 0x42415443, 0x0000001c, 0x00000023, 0xfffe0200, 0x00000000, 0x00000000, 0x20000400, 0x0000001c, + 0x325f7376, 0x4d00305f, 0x6f726369, 0x74666f73, 0x29522820, 0x534c4820, 0x6853204c, 0x72656461, + 0x6d6f4320, 0x656c6970, 0x30312072, 0xab00312e, 0x0200001f, 0x80000000, 0x900f0000, 0x02000001, + 0xc00f0000, 0x90e40000, 0x0000ffff, + }; + if (!(window = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { @@ -8388,6 +8420,37 @@ static void test_effect_parameter_block(void) refcount = effect->lpVtbl->Release(effect); ok(!refcount, "Got unexpected refcount %u.\n", refcount); + hr = D3DXCreateEffect(device, annotation_code, sizeof(annotation_code), + NULL, NULL, 0, NULL, &effect, NULL); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->GetFloat(effect, "f(a)a", &float_value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(float_value == 1.0f, "Got float %.8e.\n", float_value); + hr = effect->lpVtbl->SetFloat(effect, "f(a)a", 2.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetFloat(effect, "f(a)a", &float_value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(float_value == 2.0f, "Got float %.8e.\n", float_value); + + hr = effect->lpVtbl->BeginParameterBlock(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->SetFloat(effect, "f(a)a", 3.0f); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetFloat(effect, "f(a)a", &float_value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(float_value == 2.0f, "Got float %.8e.\n", float_value); + block = effect->lpVtbl->EndParameterBlock(effect); + ok(!!block, "Got unexpected block %p.\n", block); + hr = effect->lpVtbl->ApplyParameterBlock(effect, block); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = effect->lpVtbl->GetFloat(effect, "f(a)a", &float_value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(float_value == 3.0f, "Got float %.8e.\n", float_value); + + refcount = effect->lpVtbl->Release(effect); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d);

1 0