June 2020 - Wine-commits - list.winehq.org

Rémi Bernon : crypt32/tests: Fix signed integral cast warning.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 4e94e2106099a008d64fef0ed3566aab35361534 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e94e2106099a008d64fef0e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:32 2020 +0200 crypt32/tests: Fix signed integral cast warning. First cast to int, then to DWORD. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 880ae720a4..7d6d07fe02 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2909,7 +2909,7 @@ static void testGetValidUsages(void) ret = pCertGetValidUsages(0, NULL, NULL, NULL, &size); */ contexts[0] = NULL; - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; SetLastError(0xdeadbeef); ret = pCertGetValidUsages(1, &contexts[0], &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %d\n", GetLastError()); @@ -2921,12 +2921,12 @@ static void testGetValidUsages(void) sizeof(certWithUsage)); contexts[2] = CertCreateCertificateContext(X509_ASN_ENCODING, cert2WithUsage, sizeof(cert2WithUsage)); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(0, NULL, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs); ok(size == 0, "Expected size 0, got %d\n", size); - numOIDs = size = 0xdeadbeef; + size = numOIDs = 0xdeadbeef; ret = pCertGetValidUsages(1, contexts, &numOIDs, NULL, &size); ok(ret, "CertGetValidUsages failed: %08x\n", GetLastError()); ok(numOIDs == -1, "Expected -1, got %d\n", numOIDs);

1 0

Rémi Bernon : dxgi/tests: Fix signed integral cast warning.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: abced34e67587a4441b61e1f8d3b8ca0e9bec31e URL: https://source.winehq.org/git/wine.git/?a=commit;h=abced34e67587a4441b61e1f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:33 2020 +0200 dxgi/tests: Fix signed integral cast warning. First cast to LONG, then to DWORD. Reported by MinGW GCC 10 with -Woverflow. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e8dfa036e0..8f52e1d9e7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1103,7 +1103,7 @@ static void test_check_interface_support(void) hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, NULL); ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); - driver_version.HighPart = driver_version.LowPart = 0xdeadbeef; + driver_version.LowPart = driver_version.HighPart = 0xdeadbeef; hr = IDXGIAdapter_CheckInterfaceSupport(adapter, &IID_ID3D11Device, &driver_version); ok(hr == DXGI_ERROR_UNSUPPORTED, "Got unexpected hr %#x.\n", hr); ok(driver_version.HighPart == 0xdeadbeef, "Got unexpected driver version %#x.\n", driver_version.HighPart);

1 0

Rémi Bernon : sxs: Fix uninitialized variable warning.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2c9c20c0a6c55daf234318cb529a08646d410e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c9c20c0a6c55daf234318cb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 3 11:50:36 2020 +0200 sxs: Fix uninitialized variable warning. Reported by MinGW GCC 10 with -Wmaybe-uninitialized, this seems to be a typo. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/name.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sxs/name.c b/dlls/sxs/name.c index a76510a9fe..6b3ae5197a 100644 --- a/dlls/sxs/name.c +++ b/dlls/sxs/name.c @@ -135,7 +135,6 @@ static HRESULT WINAPI name_GetDisplayName( { static const WCHAR fmtW[] = {',','%','s','=','\"','%','s','\"',0}; struct name *name = impl_from_IAssemblyName( iface ); - WCHAR version[30]; unsigned int len; TRACE("%p, %p, %p, 0x%08x\n", iface, buffer, buflen, flags); @@ -146,7 +145,7 @@ static HRESULT WINAPI name_GetDisplayName( if (name->arch) len += lstrlenW( archW ) + lstrlenW( name->arch ) + 4; if (name->token) len += lstrlenW( tokenW ) + lstrlenW( name->token ) + 4; if (name->type) len += lstrlenW( typeW ) + lstrlenW( name->type ) + 4; - if (name->version) len += lstrlenW( versionW ) + lstrlenW( version ) + 4; + if (name->version) len += lstrlenW( versionW ) + lstrlenW( name->version ) + 4; if (len > *buflen) { *buflen = len;

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2200b841d566580eeb77655c1a1fc2a797855fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2200b841d566580eeb77655c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:03 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in wined3d_device_reset(). We require an implicit swapchain, so "d3d_initialized" is always true. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9b59371bb2..4544e28bc4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5385,8 +5385,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_cs_emit_unload_resource(device->cs, resource); } - if (device->d3d_initialized) - device->adapter->adapter_ops->adapter_uninit_3d(device); + device->adapter->adapter_ops->adapter_uninit_3d(device); memset(&device->state, 0, sizeof(device->state)); state_init(&device->state, &device->adapter->d3d_info, WINED3D_STATE_INIT_DEFAULT); @@ -5403,7 +5402,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_set_depth_stencil_view(device, view); } - if (device->d3d_initialized && reset_state) + if (reset_state) hr = device->adapter->adapter_ops->adapter_init_3d(device); /* All done. There is no need to reload resources or shaders, this will happen automatically on the

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in context_resource_released().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: c125c65846b843ab5f3369a4fa38956d5aca5a21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c125c65846b843ab5f3369a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:04 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in context_resource_released(). When this was introduced in commit 401e99b0c074af848379b2602df37fb1e6c7536b, it protected against calling the equivalent of context_acquire() on the equivalent of the no3d adapter. Commit 94d33d3e861d8e01b4edcb940e8ab1aa98359520 removed the call in question. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7959199e1f..3a263e1f6b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -36,9 +36,6 @@ void context_resource_released(const struct wined3d_device *device, struct wined { unsigned int i; - if (!device->d3d_initialized) - return; - for (i = 0; i < device->context_count; ++i) { struct wined3d_context *context = device->contexts[i];

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in device_resource_released().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: cc6d90b8236ce5ba73b09e6f5eeb164e506a07a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc6d90b8236ce5ba73b09e6f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:05 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in device_resource_released(). This used to protect against accessing the framebuffer state on the no3d adapter; that's no longer a concern. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4544e28bc4..2ce3e346ef 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5493,18 +5493,15 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); - if (device->d3d_initialized) + for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) { - for (i = 0; i < ARRAY_SIZE(device->state.fb.render_targets); ++i) - { - if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) - ERR("Resource %p is still in use as render target %u.\n", resource, i); - } - - if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) - ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + if ((rtv = device->state.fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); } + if ((rtv = device->state.fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + switch (type) { case WINED3D_RTYPE_TEXTURE_1D:

1 0

Henri Verbeet : wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 4616867798788f47624292031a1b906e2a119eaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=4616867798788f4762429203… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:06 2020 +0430 wined3d: Get rid of the "d3d_initialized" check in wined3d_texture_update_map_binding(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bef2c4ec30..f0b25ce90d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -769,11 +769,10 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; DWORD map_binding = texture->update_map_binding; - struct wined3d_context *context = NULL; + struct wined3d_context *context; unsigned int i; - if (device->d3d_initialized) - context = context_acquire(device, NULL, 0); + context = context_acquire(device, NULL, 0); for (i = 0; i < sub_count; ++i) { @@ -784,8 +783,7 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) wined3d_texture_remove_buffer_object(texture, i, wined3d_context_gl(context)->gl_info); } - if (context) - context_release(context); + context_release(context); texture->resource.map_binding = map_binding; texture->update_map_binding = 0;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 9af34f9aea2e4f0d6064450b64fb162affca5561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af34f9aea2e4f0d6064450b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:07 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in arbfp_blit_supported(). The idea is to get rid of the WINED3DFMT_FLAG_DEPTH and WINED3DFMT_FLAG_STENCIL format flags, and instead introduce a flag similar to WINED3DFMT_FLAG_RENDERTARGET that indicates whether the format can be used with WINED3D_BIND_DEPTH_STENCIL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e6daa88afd..4724e5c959 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7722,7 +7722,7 @@ static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wine if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: ce4b63dc8802e93bd72a4bd967845a9bfc447144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce4b63dc8802e93bd72a4bd9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:08 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in glsl_blitter_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ddb76143b5..66e90b1768 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12975,7 +12975,7 @@ static BOOL glsl_blitter_supported(enum wined3d_blit_op blit_op, const struct wi if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 2b2a6ebdd1fad8fa050ff9d59cfb11f7f6e8d3ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b2a6ebdd1fad8fa050ff9d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 3 15:58:09 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in ffp_blit_supported(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f0b25ce90d..fcb9ff8a1c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5211,7 +5211,7 @@ static bool ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3 if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) { - if (dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_format->depth_size || dst_format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0