February 2022 - Wine-Commits

Piotr Caban : msvcp60: Remove STREAMSIZE_BITS definition.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 7de544ee066f2f3887cbae67299b82d0debf1a38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de544ee066f2f3887cbae67… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 9 18:09:03 2022 +0100 msvcp60: Remove STREAMSIZE_BITS definition. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 248 --------------------------------------------------- dlls/msvcp60/msvcp.h | 2 - 2 files changed, 250 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7de544ee066f2f3887cb…

1 0

Matteo Bruni : wined3d: Skip non-color outputs in SM4 shader output mapping.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: ee78b46e8a7d139c6f17484c455a1d4ccd3d2ce6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee78b46e8a7d139c6f17484c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 9 16:50:02 2022 +0100 wined3d: Skip non-color outputs in SM4 shader output mapping. 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> --- dlls/wined3d/shader_sm4.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5afe612da21..061ab51d024 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1320,6 +1320,9 @@ static void *shader_sm4_init(const DWORD *byte_code, size_t byte_code_size, { struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + if (priv->shader_version.type == WINED3D_SHADER_TYPE_PIXEL + && _strnicmp(e->semantic_name, "SV_TARGET", -1)) + continue; if (e->register_idx >= ARRAY_SIZE(priv->output_map)) { WARN("Invalid output index %u.\n", e->register_idx);

1 0

Zebediah Figura : ws2_32/tests: Cancel a call that currently incorrectly returns STATUS_PENDING.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: d9f3ea328785d4146a095ce2efbdbb7c1f69f1cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9f3ea328785d4146a095ce2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 9 12:06:52 2022 -0600 ws2_32/tests: Cancel a call that currently incorrectly returns STATUS_PENDING. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 55029bfd30d..d8a78947de4 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1387,6 +1387,12 @@ static void test_recv(void) todo_wine ok(!io.Status, "got %#x\n", io.Status); todo_wine ok(io.Information == 1, "got %#Ix\n", io.Information); todo_wine ok(buffer[0] == 'a', "got %s\n", debugstr_an(buffer, io.Information)); + if (ret == STATUS_PENDING) + { + CancelIo((HANDLE)client); + ret = WaitForSingleObject(event, 100); + ok(!ret, "wait timed out\n"); + } params.msg_flags = AFD_MSG_NOT_OOB | AFD_MSG_PEEK;

1 0

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

Feb. 9, 2022

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

Eric Pouech : mf: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

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

Zebediah Figura : d3dx9: Pass the "flags" argument to D3DXFXCreateEffectEx() as compiler flags, not effect flags.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: b3b6d8c99ea4cd4cddce8d7c49333f36673f4703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3b6d8c99ea4cd4cddce8d7c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:24:33 2022 -0600 d3dx9: Pass the "flags" argument to D3DXFXCreateEffectEx() as compiler flags, not effect flags. And strip D3DXFX_* creation flags from them. 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e623c10035a..b8c957245a6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -6393,7 +6393,7 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDevice9 *device, const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct ID3DXEffectPool *pool, const char *skip_constants_string) + UINT flags, ID3DBlob **errors, struct ID3DXEffectPool *pool, const char *skip_constants_string) { #if D3DX_SDK_VERSION <= 36 UINT compile_flags = D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY; @@ -6409,9 +6409,9 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev unsigned int i, j; HRESULT hr; - TRACE("effect %p, device %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + TRACE("effect %p, device %p, data %p, data_size %lu, defines %p, include %p, flags %#x, errors %p, " "pool %p, skip_constants %s.\n", - effect, device, data, data_size, defines, include, eflags, errors, pool, + effect, device, data, data_size, defines, include, flags, errors, pool, debugstr_a(skip_constants_string)); effect->ID3DXEffect_iface.lpVtbl = &ID3DXEffect_Vtbl; @@ -6426,7 +6426,7 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev IDirect3DDevice9_AddRef(device); effect->device = device; - effect->flags = eflags; + effect->flags = flags; list_init(&effect->parameter_block_list); @@ -6436,8 +6436,9 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev if (tag != d3dx9_effect_version(9, 1)) { TRACE("HLSL ASCII effect, trying to compile it.\n"); + compile_flags |= flags & ~(D3DXFX_NOT_CLONEABLE | D3DXFX_LARGEADDRESSAWARE); hr = D3DCompile(data, data_size, NULL, defines, include, - NULL, "fx_2_0", compile_flags, eflags, &bytecode, &temp_errors); + NULL, "fx_2_0", compile_flags, 0, &bytecode, &temp_errors); if (FAILED(hr)) { WARN("Failed to compile ASCII effect.\n");

1 0

Zebediah Figura : d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: b6062279b88650104918a9004a631e24be87a87b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6062279b88650104918a900… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Feb 7 17:24:32 2022 -0600 d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started. 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 | 6 ++++++ dlls/d3dx9_36/tests/effect.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22afa649db3..e623c10035a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4001,6 +4001,12 @@ static HRESULT WINAPI d3dx_effect_BeginPass(ID3DXEffect *iface, UINT pass) TRACE("iface %p, pass %u\n", effect, pass); + if (!effect->started) + { + WARN("Effect is not started, returning D3DERR_INVALIDCALL.\n"); + return D3DERR_INVALIDCALL; + } + if (technique && pass < technique->pass_count && !effect->active_pass) { HRESULT hr; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ea90299f936..d4efc1101d9 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -3081,6 +3081,12 @@ static void test_effect_states(IDirect3DDevice9 *device) NULL, NULL, 0, NULL, &effect, NULL); ok(hr == D3D_OK, "Got result %x, expected 0 (D3D_OK).\n", hr); + hr = effect->lpVtbl->End(effect); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + + hr = effect->lpVtbl->BeginPass(effect, 0); + ok(hr == D3DERR_INVALIDCALL, "Got result %#x.\n", hr); + /* State affected in passes saved/restored even if no pass was performed. States not present in passes are not saved & restored */

1 0

Stefan Dösinger : include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 20c2e5ba283c0e82617171c8fd1b88620641f077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c2e5ba283c0e82617171c8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 1 16:58:21 2022 +0300 include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86. 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, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 18d9fa656f8..698f29d990e 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6292,7 +6292,6 @@ typedef enum _PROCESS_MITIGATION_POLICY #pragma intrinsic(_InterlockedCompareExchange64) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) -#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(_InterlockedIncrement) #pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) @@ -6309,7 +6308,6 @@ long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); -long long _InterlockedExchangeAdd64(long long volatile*,long long); long _InterlockedIncrement(long volatile*); short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); @@ -6352,8 +6350,10 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__x86_64__) +#pragma intrinsic(_InterlockedExchangeAdd64) #pragma intrinsic(__faststorefence) +long long _InterlockedExchangeAdd64(long long volatile *, long long); void __faststorefence(void); static FORCEINLINE void MemoryBarrier(void)

1 0

Piotr Caban : msvcp60: Use %Id format when tracing streamoff and streamsize.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

Module: wine Branch: master Commit: 83b9f3101e5f2aad2090b9e7436d8eaa73eb8d45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83b9f3101e5f2aad2090b9e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 9 18:08:59 2022 +0100 msvcp60: Use %Id format when tracing streamoff and streamsize. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/ios.c | 112 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83b9f3101e5f2aad2090…

1 0

Zebediah Figura : qedit: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Feb. 9, 2022

Feb. 9, 2022

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