February 2022 - Wine-commits

Matteo Bruni : wined3d: Skip non-color outputs in SM4 shader output mapping.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Paul Gofman : ws2_32: Trace status on operation failure.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: 2a38dab2d28186921198b93f7626122d17b00c2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a38dab2d28186921198b93f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 9 20:34:45 2022 +0300 ws2_32: Trace status on operation failure. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fb2086b11e9..e5e29107853 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -747,7 +747,7 @@ SOCKET WINAPI accept( SOCKET s, struct sockaddr *addr, int *len ) } if (status) { - WARN( "failed; status %#lx\n", status ); + TRACE( "failed, status %#lx\n", status ); WSASetLastError( NtStatusToWSAError( status ) ); return INVALID_SOCKET; } @@ -814,6 +814,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D if (ret_len) *ret_len = overlapped->InternalHigh; WSASetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -867,6 +868,7 @@ static BOOL WINAPI WS2_TransmitFile( SOCKET s, HANDLE file, DWORD file_len, DWOR status = piosb->u.Status; } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -955,6 +957,7 @@ static int WS2_recv_base( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD * } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1021,6 +1024,7 @@ static int WS2_sendto( SOCKET s, WSABUF *buffers, DWORD buffer_count, DWORD *ret } if (!status && ret_size) *ret_size = piosb->Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1149,7 +1153,8 @@ int WINAPI bind( SOCKET s, const struct sockaddr *addr, int len ) status = io.u.Status; } - if (!status) TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); + if (status) TRACE( "failed, status %#lx.\n", status ); + else TRACE( "successfully bound to address %s\n", debugstr_sockaddr( ret_addr )); free( params ); free( ret_addr ); @@ -1218,6 +1223,7 @@ int WINAPI connect( SOCKET s, const struct sockaddr *addr, int len ) { /* NtStatusToWSAError() has no mapping for WSAEALREADY */ SetLastError( status == STATUS_ADDRESS_ALREADY_ASSOCIATED ? WSAEALREADY : NtStatusToWSAError( status ) ); + TRACE( "failed, status %#lx.\n", status ); return -1; } return 0; @@ -1273,6 +1279,7 @@ static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct sockaddr *name, int nam free( params ); if (ret_len) *ret_len = overlapped->InternalHigh; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1303,6 +1310,7 @@ static BOOL WINAPI WS2_DisconnectEx( SOCKET s, OVERLAPPED *overlapped, DWORD fla IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); if (!status && overlapped) status = STATUS_PENDING; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return !status; } @@ -1334,6 +1342,7 @@ int WINAPI getpeername( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1358,6 +1367,7 @@ int WINAPI getsockname( SOCKET s, struct sockaddr *addr, int *len ) if (!status) *len = io.Information; WSASetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1370,6 +1380,7 @@ static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); if (!status) *optlen = io.Information; SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -1960,6 +1971,7 @@ static DWORD server_ioctl_sock( SOCKET s, DWORD code, LPVOID in_buff, DWORD in_s else if (status == STATUS_SUCCESS) *ret_size = piosb->Information; + TRACE( "status %#lx.\n", status ); return NtStatusToWSAError( status ); } @@ -2322,6 +2334,7 @@ int WINAPI listen( SOCKET s, int backlog ) status = NtDeviceIoControlFile( SOCKET2HANDLE(s), NULL, NULL, NULL, &io, IOCTL_AFD_LISTEN, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -2517,6 +2530,7 @@ int WINAPI select( int count, fd_set *read_ptr, fd_set *write_ptr, free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2661,6 +2675,7 @@ int WINAPI WSAPoll( WSAPOLLFD *fds, ULONG count, int timeout ) free( params ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : ret_count; } @@ -2744,6 +2759,7 @@ static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optl status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3055,6 +3071,7 @@ int WINAPI shutdown( SOCKET s, int how ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_SHUTDOWN, &how, sizeof(how), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3112,6 +3129,7 @@ int WINAPI WSAEnumNetworkEvents( SOCKET s, WSAEVENT event, WSANETWORKEVENTS *ret } } SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3156,6 +3174,7 @@ int WINAPI WSAEventSelect( SOCKET s, WSAEVENT event, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_EVENT_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3201,6 +3220,7 @@ BOOL WINAPI WSAGetOverlappedResult( SOCKET s, LPWSAOVERLAPPED lpOverlapped, *lpdwFlags = lpOverlapped->u.s.Offset; SetLastError( NtStatusToWSAError(status) ); + TRACE( "status %#lx.\n", status ); return NT_SUCCESS( status ); } @@ -3224,6 +3244,7 @@ int WINAPI WSAAsyncSelect( SOCKET s, HWND window, UINT message, LONG mask ) status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, IOCTL_AFD_WINE_MESSAGE_SELECT, &params, sizeof(params), NULL, 0 ); SetLastError( NtStatusToWSAError( status ) ); + TRACE( "status %#lx.\n", status ); return status ? -1 : 0; } @@ -3563,7 +3584,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, ret = (*callback)( &caller_id, &caller_data, NULL, NULL, &callee_id, &callee_data, &group, context ); - + TRACE( "callback returned %d.\n", ret ); switch (ret) { case CF_ACCEPT: @@ -3579,6 +3600,7 @@ SOCKET WINAPI WSAAccept( SOCKET s, struct sockaddr *addr, int *addrlen, &server_handle, sizeof(server_handle), NULL, 0 ); closesocket( cs ); SetLastError( status ? RtlNtStatusToDosError( status ) : WSATRY_AGAIN ); + TRACE( "status %#lx.\n", status ); return -1; }

1 0

Zebediah Figura : ws2_32/tests: Cancel a call that currently incorrectly returns STATUS_PENDING.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Stefan Dösinger : include: InterlockedExchangeAdd64 msvc intrinsic does not exist in x86.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Stefan Dösinger : include: Remove an incorrect InterlockedCompareExchange128 function.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Stefan Dösinger : makedep: Fix some signed vs unsigned msvc warnings.
by Alexandre Julliard 09 Feb '22

09 Feb '22

Module: wine Branch: master Commit: e5041acfa2b38c73dcb340c5a5ee1244b9d9af82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5041acfa2b38c73dcb340c5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 1 16:58:23 2022 +0300 makedep: Fix some signed vs unsigned msvc warnings. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 4172720fbf0..edb5d5a42d0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2036,7 +2036,7 @@ static const char *get_native_unix_lib( const struct makefile *make, const char static struct makefile *get_parent_makefile( struct makefile *make ) { char *dir, *p; - int i; + unsigned int i; if (!make->obj_dir) return NULL; dir = xstrdup( make->obj_dir ); @@ -3924,7 +3924,7 @@ static void output_testlist( const struct makefile *make ) */ static void output_gitignore( const char *dest, struct strarray files ) { - int i; + unsigned int i; output_file = create_temp_file( dest ); @@ -4026,7 +4026,8 @@ static void output_top_makefile( struct makefile *make ) { char buffer[1024]; FILE *src_file; - int i, found = 0; + unsigned int i; + int found = 0; output_file_name = obj_dir_path( make, output_makefile_name ); output_file = create_temp_file( output_file_name );

1 0

Zebediah Figura : d3dx9: Return D3DERR_INVALIDCALL from ID3DXEffect::BeginPass() if the effect is not started.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

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

09 Feb '22

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: Don't mark annotation variables as dirty.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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

Zebediah Figura : d3dx9/tests: Test setting annotation values.
by Alexandre Julliard 09 Feb '22

09 Feb '22

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