February 2022 - Wine-commits

Eric Pouech : mf: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: ef825f49daaf80cdcbc702a27b231b0bf5723d8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef825f49daaf80cdcbc702a2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 9 14:27:42 2022 +0300 mf: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/Makefile.in | 1 - dlls/mf/clock.c | 16 ++++----- dlls/mf/copier.c | 38 +++++++++++----------- dlls/mf/evr.c | 36 ++++++++++----------- dlls/mf/main.c | 20 ++++++------ dlls/mf/quality.c | 8 ++--- dlls/mf/samplegrabber.c | 26 +++++++-------- dlls/mf/sar.c | 58 ++++++++++++++++----------------- dlls/mf/session.c | 86 ++++++++++++++++++++++++------------------------- dlls/mf/topology.c | 58 ++++++++++++++++----------------- 10 files changed, 173 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ef825f49daaf80cdcbc7…

1 0

Eric Pouech : xapofx1_1: Enable compilation with long types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Matteo Bruni : winhttp/tests: Fix typo in an ok() message.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Matteo Bruni : d3dcompiler: Use more consistent integer data types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 : d3d10: Get rid of a comment.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Matteo Bruni : d3d10: Use more consistent integer data types.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: b5d610ca3735ec9329ad4f7e3da33f7a1079fba9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5d610ca3735ec9329ad4f7e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:30:07 2022 +0100 d3d10: 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/d3d10/d3d10_private.h | 61 +++--- dlls/d3d10/effect.c | 533 ++++++++++++++++++++++----------------------- 2 files changed, 294 insertions(+), 300 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5d610ca3735ec9329ad…

1 0

Matteo Bruni : d3dcompiler: Move read_u32() to a new utils.h private header.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 : d3d10: Use read_u32() implementation from d3dcompiler.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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 : d3dcompiler: Move skip_u32_unknown() declaration to utils.h.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Zebediah Figura : qedit: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 6302ca9f04c52ef4cac450ffeb6ea3effd89d5a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6302ca9f04c52ef4cac450ff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 10:38:44 2022 -0600 qedit: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/Makefile.in | 1 - dlls/qedit/mediadet.c | 40 +++++++++++++++++----------------- dlls/qedit/samplegrabber.c | 14 +++++++----- dlls/qedit/timeline.c | 54 +++++++++++++++++++++++----------------------- 4 files changed, 56 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6302ca9f04c52ef4cac4…

1 0