February 2022 - Wine-commits

Piotr Caban : msvcrt: Print 0x prefix with %#x format in traces.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 4397d97d91d4480c995a81364f71d7f088a79510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4397d97d91d4480c995a8136… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 8 19:39:12 2022 +0100 msvcrt: Print 0x prefix with %#x format in traces. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/data.c | 2 +- dlls/msvcrt/file.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index 8b6c34abf56..d1f514fd460 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -656,7 +656,7 @@ int CDECL _initterm_e(_INITTERM_E_FN *table, _INITTERM_E_FN *end) TRACE("calling %p\n", **table); res = (**table)(); if (res) - TRACE("function %p failed: 0x%x\n", *table, res); + TRACE("function %p failed: %#x\n", *table, res); } table++; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 7c39a50a656..86c67868381 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1368,7 +1368,7 @@ int CDECL _locking(int fd, int mode, __msvcrt_long nbytes) return -1; } - TRACE(":fd (%d) by 0x%lx mode %s\n", + TRACE(":fd (%d) by %#lx mode %s\n", fd, nbytes, (mode == _LK_UNLCK) ? "_LK_UNLCK" : (mode == _LK_LOCK) ? "_LK_LOCK" : (mode == _LK_NBLCK) ? "_LK_NBLCK" : @@ -1815,7 +1815,7 @@ int CDECL _fstat64(int fd, struct _stat64* buf) RtlTimeToSecondsSince1970((LARGE_INTEGER *)&basic_info.LastWriteTime, &dw); buf->st_mtime = buf->st_ctime = dw; buf->st_nlink = std_info.NumberOfLinks; - TRACE(":dwFileAttributes = 0x%lx, mode set to 0x%x\n", + TRACE(":dwFileAttributes = %#lx, mode set to %#x\n", basic_info.FileAttributes, buf->st_mode); } release_ioinfo(info); @@ -2121,7 +2121,7 @@ static unsigned split_oflags(unsigned oflags) if ((unsupp = oflags & ~(_O_BINARY | _O_TEXT | _O_APPEND | _O_TRUNC | _O_EXCL | _O_CREAT | _O_RDWR | _O_WRONLY | _O_TEMPORARY | _O_NOINHERIT | _O_SEQUENTIAL | _O_RANDOM | _O_SHORT_LIVED | _O_WTEXT | _O_U16TEXT | _O_U8TEXT))) - ERR(":unsupported oflags 0x%04x\n",unsupp); + ERR(":unsupported oflags %#x\n",unsupp); return wxflags; } @@ -2212,7 +2212,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm int wxflag; HANDLE hand; - TRACE("path: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x fd*: %p secure: %d\n", + TRACE("path: (%s) oflags: %#x shflags: %#x pmode: %#x fd*: %p secure: %d\n", debugstr_w(path), oflags, shflags, pmode, fd, secure); if (!MSVCRT_CHECK_PMT( fd != NULL )) return EINVAL; @@ -2261,7 +2261,7 @@ int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pm sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; break; default: - ERR( "Unhandled shflags 0x%x\n", shflags ); + ERR( "Unhandled shflags %#x\n", shflags ); return EINVAL; } @@ -2547,7 +2547,7 @@ int CDECL _open_osfhandle(intptr_t handle, int oflags) flags |= split_oflags(oflags); fd = msvcrt_alloc_fd((HANDLE)handle, flags); - TRACE(":handle (%Iu) fd (%d) flags 0x%08lx\n", handle, fd, flags); + TRACE(":handle (%Iu) fd (%d) flags %#lx\n", handle, fd, flags); return fd; }

1 0

Piotr Caban : msvcp: Print 0x prefix with %#x format in traces.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 09343d89818d75ceed821e2dda9779f6812f0771 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09343d89818d75ceed821e2d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 8 19:39:19 2022 +0100 msvcp: Print 0x prefix with %#x format in traces. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7856e0e33d..c7a56ad9e97 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -1479,7 +1479,7 @@ BOOL CDECL MSVCP__crtInitializeCriticalSectionEx( HANDLE CDECL MSVCP__crtCreateEventExW( SECURITY_ATTRIBUTES *attribs, LPCWSTR name, DWORD flags, DWORD access) { - TRACE("(%p %s 0x%08lx 0x%08lx)\n", attribs, debugstr_w(name), flags, access); + TRACE("(%p %s %#lx %#lx)\n", attribs, debugstr_w(name), flags, access); return CreateEventExW(attribs, name, flags, access); } @@ -1514,7 +1514,7 @@ HANDLE CDECL MSVCP__crtCreateSemaphoreExW( SECURITY_ATTRIBUTES *attribs, LONG initial_count, LONG max_count, LPCWSTR name, DWORD flags, DWORD access) { - TRACE("(%p %ld %ld %s 0x%08lx 0x%08lx)\n", attribs, initial_count, max_count, debugstr_w(name), + TRACE("(%p %ld %ld %s %#lx %#lx)\n", attribs, initial_count, max_count, debugstr_w(name), flags, access); return CreateSemaphoreExW(attribs, initial_count, max_count, name, flags, access); } @@ -1544,7 +1544,7 @@ VOID CDECL MSVCP__crtCloseThreadpoolTimer(TP_TIMER *timer) VOID CDECL MSVCP__crtSetThreadpoolTimer(TP_TIMER *timer, FILETIME *due_time, DWORD period, DWORD window_length) { - TRACE("(%p %p 0x%08lx 0x%08lx)\n", timer, due_time, period, window_length); + TRACE("(%p %p %#lx %#lx)\n", timer, due_time, period, window_length); return SetThreadpoolTimer(timer, due_time, period, window_length); }

1 0

Eric Pouech : d3d10/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 7bba86db284127942104116c695ca57fdf957496 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bba86db284127942104116c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:43 2022 +0100 d3d10/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/Makefile.in | 2 +- dlls/d3d10/tests/device.c | 54 +- dlls/d3d10/tests/effect.c | 1168 ++++++++++++++++---------------- dlls/d3dcompiler_43/tests/reflection.c | 3 + 4 files changed, 614 insertions(+), 613 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7bba86db284127942104…

1 0

Eric Pouech : d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 58d20aae3772473a90e43ee236b793f0421eecb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d20aae3772473a90e43ee2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:44 2022 +0100 d3dcompiler/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/Makefile.in | 2 +- dlls/d3dcompiler_43/tests/asm.c | 58 ++++--- dlls/d3dcompiler_43/tests/blob.c | 290 ++++++++++++++++----------------- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 68 ++++---- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 126 +++++++------- dlls/d3dcompiler_43/tests/reflection.c | 205 ++++++++++++----------- dlls/d3dcompiler_46/tests/Makefile.in | 2 +- dlls/d3dcompiler_47/tests/Makefile.in | 2 +- 8 files changed, 378 insertions(+), 375 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d20aae3772473a90e4…

1 0

Henri Verbeet : d3d10: Return the read value from read_dword().
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: ee01c2022f5f4618390a3554c5a701a8a508431f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee01c2022f5f4618390a3554… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 8 19:48:45 2022 +0100 d3d10: Return the read value from read_dword(). This makes it consistent with d3dcompiler after commit e6961f6e16b35729301967b04078158cd66eaab2. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 202 +++++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ee01c2022f5f4618390a…

1 0

Henri Verbeet : d3d10: Store the type fields in parse_fx10_type() as uint32_t.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 2afd69d1565a6fde99cc47af30b5fd3cf864fec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2afd69d1565a6fde99cc47af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 8 19:48:46 2022 +0100 d3d10: Store the type fields in parse_fx10_type() as uint32_t. In particular, d3d10_variable_type() takes an integer flags pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4759dea5ee9..68afc061d1e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1402,7 +1402,7 @@ static D3D10_SHADER_VARIABLE_TYPE d3d10_variable_type(DWORD t, BOOL is_object, static HRESULT parse_fx10_type(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_type *t) { - DWORD typeinfo, type_flags, type_kind; + uint32_t typeinfo, type_flags, type_kind; const char *ptr; unsigned int i;

1 0

Eric Pouech : d3d10: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 96b08eaecbd583b674780dd202369ada1c6a4c38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96b08eaecbd583b674780dd2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 8 19:48:47 2022 +0100 d3d10: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/Makefile.in | 2 +- dlls/d3d10/d3d10_main.c | 24 ++--- dlls/d3d10/effect.c | 228 +++++++++++++++++++-------------------- dlls/d3d10/shader.c | 2 +- dlls/d3d10/stateblock.c | 4 +- dlls/d3dcompiler_43/reflection.c | 7 +- dlls/d3dcompiler_43/utils.c | 3 + 7 files changed, 138 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=96b08eaecbd583b67478…

1 0

Zebediah Figura : maintainers: Remove wineqtdecoder.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 0107ab35dd8a5f2d9204ef9c235574e46ba820e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0107ab35dd8a5f2d9204ef9c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:47 2022 -0600 maintainers: Remove wineqtdecoder. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 6cc4e5813df..a90c91b60b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -111,7 +111,6 @@ F: dlls/qedit/ F: dlls/quartz/ F: dlls/strmbase/ F: dlls/winegstreamer/quartz_parser.c -F: dlls/wineqtdecoder/ DirectWrite M: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Zebediah Figura : strmbase: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 46f7d4c1314b1674943e86f1e2bda2860ecda94b URL: https://source.winehq.org/git/wine.git/?a=commit;h=46f7d4c1314b1674943e86f1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 23:22:48 2022 -0600 strmbase: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/strmbase/Makefile.in | 1 - libs/strmbase/dispatch.c | 4 ++-- libs/strmbase/filter.c | 14 +++++++------- libs/strmbase/mediatype.c | 38 +++++++++++++++++++------------------- libs/strmbase/pin.c | 10 +++++----- libs/strmbase/pospass.c | 17 ++++++++++++----- libs/strmbase/renderer.c | 2 +- libs/strmbase/seeking.c | 7 +++++-- 8 files changed, 51 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=46f7d4c1314b1674943e…

1 0

Rémi Bernon : dinput: Rename IDirectInputImpl to struct dinput.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: f0935f850c34b1f9d8b4bf84903365c2874bc4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0935f850c34b1f9d8b4bf84… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:36 2022 +0100 dinput: Rename IDirectInputImpl to struct dinput. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 54 ++++++++++----------- dlls/dinput/device.c | 4 +- dlls/dinput/device_private.h | 4 +- dlls/dinput/dinput_main.c | 111 +++++++++++++++++++++---------------------- dlls/dinput/dinput_private.h | 31 ++++++------ dlls/dinput/joystick_hid.c | 2 +- dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 8 files changed, 104 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0935f850c34b1f9d8b4…

1 0