February 2020 - Wine-Commits

Alex Henrie : include: Add GetIcmpStatisticsEx.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 3991bca56d824a2b0dba12a929e7802ce12c8a8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3991bca56d824a2b0dba12a9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 10 23:48:46 2020 -0700 include: Add GetIcmpStatisticsEx. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iphlpapi.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/iphlpapi.h b/include/iphlpapi.h index c618e733e7..da5819c842 100644 --- a/include/iphlpapi.h +++ b/include/iphlpapi.h @@ -79,6 +79,8 @@ DWORD WINAPI GetIpStatisticsEx(PMIB_IPSTATS pStats, DWORD dwFamily); DWORD WINAPI GetIcmpStatistics(PMIB_ICMP pStats); +DWORD WINAPI GetIcmpStatisticsEx(PMIB_ICMP_EX pStats, DWORD dwFamily); + DWORD WINAPI GetTcpStatistics(PMIB_TCPSTATS pStats); DWORD WINAPI GetTcpStatisticsEx(PMIB_TCPSTATS pStats, DWORD dwFamily);

1 0

Rémi Bernon : mscoree/tests: Fix some format-overflow warnings.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 1117fa68dbb4afec543ae3ee1d9c6d467b4da40a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1117fa68dbb4afec543ae3ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:27 2020 +0100 mscoree/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/tests/comtest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c index 4879e3b762..69e24494e6 100644 --- a/dlls/mscoree/tests/comtest.c +++ b/dlls/mscoree/tests/comtest.c @@ -71,7 +71,7 @@ static BOOL write_resource_file(const char *path_tmp, const char *name_res, cons static BOOL compile_cs_to_dll(char *source_path, char *dest_path) { const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; - char cmdline[MAX_PATH]; + char cmdline[2 * MAX_PATH + 74]; char path_temp[MAX_PATH]; PROCESS_INFORMATION pi; STARTUPINFOA si = { 0 };

1 0

Zebediah Figura : d3d9: Stop setting the device state in d3d9_device_SetTextureStageState().
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: c4851dece328ce7cd0cb611937de88c39b756d27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4851dece328ce7cd0cb6119… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 12 09:21:54 2020 -0600 d3d9: Stop setting the device state in d3d9_device_SetTextureStageState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 55b891426c..5bf0d6484c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2653,8 +2653,6 @@ static HRESULT WINAPI d3d9_device_SetTextureStageState(IDirect3DDevice9Ex *iface wined3d_mutex_lock(); wined3d_stateblock_set_texture_stage_state(device->update_state, stage, tss_lookup[state], value); - if (!device->recording) - wined3d_device_set_texture_stage_state(device->wined3d_device, stage, tss_lookup[state], value); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Retrieve textures from the primary stateblock.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: aa18b69a66d12098cc0647ef58adacc431a2cce2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa18b69a66d12098cc0647ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 12 09:21:49 2020 -0600 d3d9: Retrieve textures from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 21 ++++++++++++++++----- dlls/d3d9/stateblock.c | 6 ++---- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1ff178881c..cfa1d14cce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2516,6 +2516,7 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_texture *wined3d_texture = NULL; + const struct wined3d_stateblock_state *state; struct d3d9_texture *texture_impl; TRACE("iface %p, stage %u, texture %p.\n", iface, stage, texture); @@ -2523,8 +2524,19 @@ static HRESULT WINAPI d3d9_device_GetTexture(IDirect3DDevice9Ex *iface, DWORD st if (!texture) return D3DERR_INVALIDCALL; + if (stage >= WINED3DVERTEXTEXTURESAMPLER0 && stage <= WINED3DVERTEXTEXTURESAMPLER3) + stage -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS); + + if (stage >= ARRAY_SIZE(state->textures)) + { + WARN("Ignoring invalid stage %u.\n", stage); + *texture = NULL; + return D3D_OK; + } + wined3d_mutex_lock(); - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage))) + state = wined3d_stateblock_get_state(device->state); + if ((wined3d_texture = state->textures[stage])) { texture_impl = wined3d_texture_get_parent(wined3d_texture); *texture = &texture_impl->IDirect3DBaseTexture9_iface; @@ -2815,16 +2827,15 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) /* wined3d critical section must be taken by the caller. */ static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { + const struct wined3d_stateblock_state *state = wined3d_stateblock_get_state(device->state); struct wined3d_texture *texture; - unsigned int i, stage, map; + unsigned int i, map; map = device->auto_mipmaps; while (map) { i = wined3d_bit_scan(&map); - - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) + if ((texture = state->textures[i])) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); } } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index dfb8d8d755..a65fa1cd8d 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -116,9 +116,9 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); struct wined3d_texture *wined3d_texture; - unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; + unsigned int i, offset, stride; enum wined3d_format_id format; struct d3d9_texture *texture; struct d3d9_device *device; @@ -151,9 +151,7 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) device->auto_mipmaps = 0; for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) { - stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; - - if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + if ((wined3d_texture = wined3d_stateblock_get_state(device->state)->textures[i]) && (texture = wined3d_texture_get_parent(wined3d_texture)) && texture->usage & D3DUSAGE_AUTOGENMIPMAP) device->auto_mipmaps |= 1u << i;

1 0

Giovanni Mascellani : d2d1: Trim rasterization area when drawing Bézier curves.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: b33177355e4449178c79a6b61371e0c77f6b48e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b33177355e4449178c79a6b6… Author: Giovanni Mascellani <gio(a)debian.org> Date: Tue Feb 11 16:50:03 2020 +0100 d2d1: Trim rasterization area when drawing Bézier curves. A Bézier stroke can lie outside its "defining triangle" for at most half of the stroke width, not an entire stroke width. Signed-off-by: Giovanni Mascellani <gio(a)debian.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 112 ++++++++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b33177355e4449178c79…

1 0

Louis Lenders : vga: Add stub dll.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 24fe0b82dfeafb7270b49a47c1c10dbaa0845252 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24fe0b82dfeafb7270b49a47… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 30 13:25:44 2020 +0100 vga: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48424 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/vga/Makefile.in | 3 +++ dlls/vga/version.rc | 28 ++++++++++++++++++++++++++++ dlls/vga/vga.spec | 1 + 5 files changed, 35 insertions(+) diff --git a/configure b/configure index 2f9654fca0..dd2856d2ef 100755 --- a/configure +++ b/configure @@ -1613,6 +1613,7 @@ enable_vcruntime140 enable_vcruntime140_1 enable_vdmdbg enable_version +enable_vga enable_virtdisk enable_vssapi enable_vulkan_1 @@ -20918,6 +20919,7 @@ wine_fn_config_makefile dlls/vdmdbg enable_vdmdbg wine_fn_config_makefile dlls/ver.dll16 enable_win16 wine_fn_config_makefile dlls/version enable_version wine_fn_config_makefile dlls/version/tests enable_tests +wine_fn_config_makefile dlls/vga enable_vga wine_fn_config_makefile dlls/virtdisk enable_virtdisk wine_fn_config_makefile dlls/virtdisk/tests enable_tests wine_fn_config_makefile dlls/vmm.vxd enable_win16 diff --git a/configure.ac b/configure.ac index 28d3173335..083369fdd7 100644 --- a/configure.ac +++ b/configure.ac @@ -3724,6 +3724,7 @@ WINE_CONFIG_MAKEFILE(dlls/vdmdbg) WINE_CONFIG_MAKEFILE(dlls/ver.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/version) WINE_CONFIG_MAKEFILE(dlls/version/tests) +WINE_CONFIG_MAKEFILE(dlls/vga) WINE_CONFIG_MAKEFILE(dlls/virtdisk) WINE_CONFIG_MAKEFILE(dlls/virtdisk/tests) WINE_CONFIG_MAKEFILE(dlls/vmm.vxd,enable_win16) diff --git a/dlls/vga/Makefile.in b/dlls/vga/Makefile.in new file mode 100644 index 0000000000..223b607f22 --- /dev/null +++ b/dlls/vga/Makefile.in @@ -0,0 +1,3 @@ +MODULE = vga.dll + +RC_SRCS = version.rc diff --git a/dlls/vga/version.rc b/dlls/vga/version.rc new file mode 100644 index 0000000000..4c63f7ef8a --- /dev/null +++ b/dlls/vga/version.rc @@ -0,0 +1,28 @@ +/* + * Copyright 2020 Louis Lenders + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine vga DLL" +#define WINE_FILENAME_STR "vga.dll" + +/* these values come from Windows 7 SP1 */ +#define WINE_FILEVERSION 6,1,7600,16385 +#define WINE_FILEVERSION_STR "6.1.7600.16385" +#define WINE_PRODUCTVERSION 6,1,7600,16385 +#define WINE_PRODUCTVERSION_STR "6.1.7600.16385" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/vga/vga.spec b/dlls/vga/vga.spec new file mode 100644 index 0000000000..556df42ea1 --- /dev/null +++ b/dlls/vga/vga.spec @@ -0,0 +1 @@ +# nothing

1 0

Alex Henrie : ntdll/tests: Add more tests for RtlIpv6StringToAddress.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: cdda13321057c61b29119d678f0436b89a9f2cf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdda13321057c61b29119d67… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 30 22:57:33 2020 -0700 ntdll/tests: Add more tests for RtlIpv6StringToAddress. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index e49888022f..559a7d625c 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1537,6 +1537,8 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, { "1111:2222:3333:4444:5555:6666::8888", STATUS_SUCCESS, 35, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x8888 } }, + { "1111:2222:3333:4444:5555:6666::7777:8888", STATUS_SUCCESS, 35, + { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0x7777 }, ex_fail_6 }, { "1111:2222:3333:4444:5555::", STATUS_SUCCESS, 26, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0, 0, 0 } }, { "1111:2222:3333:4444:5555::123.123.123.123", STATUS_SUCCESS, 41, @@ -1617,6 +1619,8 @@ static const struct { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "::/16", STATUS_SUCCESS, 2, { 0, 0, 0, 0, 0, 0, 0, 0 }, ex_fail_6 }, + { "::01234", STATUS_INVALID_PARAMETER, 7, + { 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "::0", STATUS_SUCCESS, 3, { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "::0:0", STATUS_SUCCESS, 5, @@ -1650,6 +1654,12 @@ static const struct { 0x120, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "2001:0000:01234:0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, -1, { 0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0000::01234.0", STATUS_INVALID_PARAMETER, -1, + { 0x120, 0, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "2001:0::b.0", STATUS_SUCCESS, 9, + { 0x120, 0, 0, 0, 0, 0, 0, 0xb00 }, ex_fail_6 }, + { "2001::0:b.0", STATUS_SUCCESS, 9, + { 0x120, 0, 0, 0, 0, 0, 0, 0xb00 }, ex_fail_6 }, { "1.2.3.4", STATUS_INVALID_PARAMETER, 7, { 0x201, 0xab03, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1.2.3.4:1111::5555", STATUS_INVALID_PARAMETER, 7, @@ -1720,8 +1730,14 @@ static const struct { 0x100, 0x201, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::1.256.3.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.256:3.4", STATUS_INVALID_PARAMETER, 8, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1.2a.3.4", STATUS_INVALID_PARAMETER, 6, + { 0x100, 0xab01, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1::256.2.3.4", STATUS_INVALID_PARAMETER, -1, { 0x100, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab, 0xabab } }, + { "1::1a.2.3.4", STATUS_SUCCESS, 5, + { 0x100, 0, 0, 0, 0, 0, 0, 0x1a00 }, ex_fail_6 }, { "1::2::3", STATUS_SUCCESS, 4, { 0x100, 0, 0, 0, 0, 0, 0, 0x200 }, ex_fail_6 }, { "2001:0000:1234: 0000:0000:C1C0:ABCD:0876", STATUS_INVALID_PARAMETER, 15,

1 0

Alex Henrie : iphlpapi: Get rid of dummy arguments to sscanf.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 981894004851904aae68add7408bc7132dc2ec5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=981894004851904aae68add7… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 10 23:48:45 2020 -0700 iphlpapi: Get rid of dummy arguments to sscanf. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/ipstats.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index f09f042135..6ce322a8d1 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -2088,7 +2088,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= TCP_TABLE_OWNER_PID_LISTENER) map = get_pid_map( &num_entries ); @@ -2097,9 +2097,9 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets(buf, sizeof(buf), fp); while ((ptr = fgets(buf, sizeof(buf), fp))) { - if (sscanf( ptr, "%x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*x: %x:%x %x:%x %x %*s %*s %*s %*s %*s %d", &row.dwLocalAddr, &row.dwLocalPort, &row.dwRemoteAddr, - &row.dwRemotePort, &row.dwState, &inode ) != 7) + &row.dwRemotePort, &row.dwState, &inode ) != 6) continue; row.dwLocalPort = htons( row.dwLocalPort ); row.dwRemotePort = htons( row.dwRemotePort ); @@ -2386,7 +2386,7 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { char buf[512], *ptr; struct pid_map *map = NULL; - unsigned int dummy, num_entries = 0; + unsigned int num_entries = 0; int inode; if (class >= UDP_TABLE_OWNER_PID) map = get_pid_map( &num_entries ); @@ -2395,8 +2395,8 @@ DWORD build_udp_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE ptr = fgets( buf, sizeof(buf), fp ); while ((ptr = fgets( buf, sizeof(buf), fp ))) { - if (sscanf( ptr, "%u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, - &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 4) + if (sscanf( ptr, "%*u: %x:%x %*s %*s %*s %*s %*s %*s %*s %d", + &row.dwLocalAddr, &row.dwLocalPort, &inode ) != 3) continue; row.dwLocalPort = htons( row.dwLocalPort ); @@ -2708,7 +2708,6 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int num_entries = 0; struct ipv6_addr_scope *addr_scopes; unsigned int addr_scopes_size = 0; - unsigned int dummy; int inode; addr_scopes = get_ipv6_addr_scope_table(&addr_scopes_size); @@ -2721,9 +2720,9 @@ DWORD build_udp6_table( UDP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE { DWORD *local_addr = (DWORD *)&row.ucLocalAddr; - if (sscanf( ptr, "%u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &dummy, + if (sscanf( ptr, "%*u: %8x%8x%8x%8x:%x %*s %*s %*s %*s %*s %*s %*s %d", &local_addr[0], &local_addr[1], &local_addr[2], &local_addr[3], - &row.dwLocalPort, &inode ) != 7) + &row.dwLocalPort, &inode ) != 6) continue; row.dwLocalScopeId = find_ipv6_addr_scope((const IN6_ADDR *)&row.ucLocalAddr, addr_scopes, addr_scopes_size); row.dwLocalPort = htons( row.dwLocalPort );

1 0

Rémi Bernon : configure: Re-enable warnings disabled with Wno-format.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 453da26df3f9cb5d4a37af42acc2ff2fe500ca1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=453da26df3f9cb5d4a37af42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 11 19:09:36 2020 +0100 configure: Re-enable warnings disabled with Wno-format. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +++- 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/configure b/configure index dd2856d2ef..cb85fb8b8f 100755 --- a/configure +++ b/configure @@ -10370,6 +10370,68 @@ fi $as_echo "$ac_cv_crosscflags__Wno_format" >&6; } if test "x$ac_cv_crosscflags__Wno_format" = xyes; then : EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wno-format" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wformat-overflow" >&5 +$as_echo_n "checking whether the cross-compiler supports -Wformat-overflow... " >&6; } +if ${ac_cv_crosscflags__Wformat_overflow+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -Wformat-overflow" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Wformat_overflow=yes +else + ac_cv_crosscflags__Wformat_overflow=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wformat_overflow" >&5 +$as_echo "$ac_cv_crosscflags__Wformat_overflow" >&6; } +if test "x$ac_cv_crosscflags__Wformat_overflow" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wformat-overflow" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the cross-compiler supports -Wnonnull" >&5 +$as_echo_n "checking whether the cross-compiler supports -Wnonnull... " >&6; } +if ${ac_cv_crosscflags__Wnonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_cc=$CC +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -Wnonnull" +CC="$CROSSCC" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_crosscflags__Wnonnull=yes +else + ac_cv_crosscflags__Wnonnull=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +CC=$ac_wine_try_cflags_saved_cc +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crosscflags__Wnonnull" >&5 +$as_echo "$ac_cv_crosscflags__Wnonnull" >&6; } +if test "x$ac_cv_crosscflags__Wnonnull" = xyes; then : + EXTRACROSSCFLAGS="$EXTRACROSSCFLAGS -Wnonnull" fi ;; esac diff --git a/configure.ac b/configure.ac index 083369fdd7..b3389b796b 100644 --- a/configure.ac +++ b/configure.ac @@ -1063,7 +1063,9 @@ then case $host_cpu in *i[[3456789]]86*) WINE_TRY_CROSSCFLAGS([-fno-omit-frame-pointer]) ;; - x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) ;; + x86_64) WINE_TRY_CROSSCFLAGS([-Wno-format]) + WINE_TRY_CROSSCFLAGS([-Wformat-overflow]) + WINE_TRY_CROSSCFLAGS([-Wnonnull]) ;; esac dnl Default to dwarf-2 debug info

1 0

Zebediah Figura : d3d9: Retrieve texture states from the primary stateblock.
by Alexandre Julliard Feb. 13, 2020

Feb. 13, 2020

Module: wine Branch: master Commit: 6aa0e182c22c7a9a1bc50ae515ba368d77367d6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6aa0e182c22c7a9a1bc50ae5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 12 09:21:53 2020 -0600 d3d9: Retrieve texture states from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e2044b98ff..55b891426c 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2625,14 +2625,14 @@ static HRESULT WINAPI d3d9_device_GetTextureStageState(IDirect3DDevice9Ex *iface TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, stage, state, value); - if (state >= ARRAY_SIZE(tss_lookup)) + if (state >= ARRAY_SIZE(tss_lookup) || tss_lookup[state] == WINED3D_TSS_INVALID) { WARN("Invalid state %#x passed.\n", state); return D3D_OK; } wined3d_mutex_lock(); - *value = wined3d_device_get_texture_stage_state(device->wined3d_device, stage, tss_lookup[state]); + *value = wined3d_stateblock_get_state(device->state)->texture_states[stage][tss_lookup[state]]; wined3d_mutex_unlock(); return D3D_OK;

1 0