wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Eric Pouech : d2d1: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 0201606baca146c59ce2a6e01a35fd1875808515 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0201606baca146c59ce2a6e0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 19:23:14 2022 +0100 d2d1: 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/d2d1/Makefile.in | 1 - dlls/d2d1/bitmap.c | 18 ++--- dlls/d2d1/bitmap_render_target.c | 10 +-- dlls/d2d1/brush.c | 26 +++---- dlls/d2d1/dc_render_target.c | 16 ++--- dlls/d2d1/device.c | 144 +++++++++++++++++++-------------------- dlls/d2d1/effect.c | 4 +- dlls/d2d1/factory.c | 28 ++++---- dlls/d2d1/geometry.c | 24 +++---- dlls/d2d1/hwnd_render_target.c | 28 ++++---- dlls/d2d1/layer.c | 4 +- dlls/d2d1/mesh.c | 4 +- dlls/d2d1/state_block.c | 4 +- dlls/d2d1/stroke.c | 4 +- dlls/d2d1/wic_render_target.c | 32 ++++----- 15 files changed, 173 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0201606baca146c59ce2…

1 0

Henri Verbeet : d2d1: Return numeric configuration settings as uint32_t.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 2c6fd7b6178e0cc5b187863312f12b2893776138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c6fd7b6178e0cc5b1878633… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:13 2022 +0100 d2d1: Return numeric configuration settings as uint32_t. To allow building without -DWINE_NO_LONG_TYPES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/factory.c | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index de5e986f7f2..aaf6d045c73 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,6 +24,8 @@ #include <assert.h> #include <limits.h> +#include <stdint.h> +#include <stdbool.h> #include <math.h> #define COBJMACROS #include "d2d1_2.h" diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7ddd6bbc87c..1f8b3f5848b 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -937,9 +937,10 @@ D2D1_COLOR_F WINAPI D2D1ConvertColorSpace(D2D1_COLOR_SPACE src_colour_space, return ret; } -static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +static bool get_config_key_u32(HKEY default_key, HKEY application_key, const char *name, uint32_t *value) { - DWORD type, data, size; + DWORD type, size; + uint32_t data; size = sizeof(data); if (application_key && !RegQueryValueExA(application_key, @@ -951,11 +952,11 @@ static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const c name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) goto success; - return FALSE; + return false; success: *value = data; - return TRUE; + return true; } static void d2d_settings_init(void) @@ -989,7 +990,7 @@ static void d2d_settings_init(void) if (!default_key && !application_key) return; - if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + if (get_config_key_u32(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); if (application_key)

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_arb_generate_pshader().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 576e44e040a08f1c11bb4f38f16188289948988b URL: https://source.winehq.org/git/wine.git/?a=commit;h=576e44e040a08f1c11bb4f38… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:12 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_arb_generate_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fc53f78f95d..f040eea410e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -3512,17 +3512,18 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, BOOL dcl_td = FALSE; BOOL want_nv_prog = FALSE; struct arb_pshader_private *shader_priv = shader->backend_data; - DWORD map; BOOL custom_linear_fog = FALSE; + uint32_t map; char srgbtmp[4][4]; char ftoa_tmp[17]; unsigned int i, found = 0; - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (!(map & 1) - || (shader->u.ps.color0_mov && i == shader->u.ps.color0_reg) + i = wined3d_bit_scan(&map); + if ((shader->u.ps.color0_mov && i == shader->u.ps.color0_reg) || (reg_maps->shader_version.major < 2 && !i)) continue; @@ -3681,12 +3682,12 @@ static GLuint shader_arb_generate_pshader(const struct wined3d_shader *shader, /* Base Declarations */ shader_generate_arb_declarations(shader, reg_maps, buffer, gl_info, NULL, &priv_ctx); - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { unsigned char bump_const; - if (!(map & 1)) continue; - + i = wined3d_bit_scan(&map); bump_const = compiled->numbumpenvmatconsts; compiled->bumpenvmatconst[bump_const].const_num = WINED3D_CONST_NUM_UNUSED; compiled->bumpenvmatconst[bump_const].texunit = i;

1 0

Henri Verbeet : wined3d: Use wined3d_bit_scan() in shader_generate_arb_declarations().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 59b06fdb437da4f13dbdc87f4abf58dce9fbe471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59b06fdb437da4f13dbdc87f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 1 19:23:11 2022 +0100 wined3d: Use wined3d_bit_scan() in shader_generate_arb_declarations(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54a90a690ac..fc53f78f95d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -765,7 +765,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader char pshader = shader_is_pshader_version(reg_maps->shader_version.type); const struct wined3d_shader_lconst *lconst; unsigned max_constantsF; - DWORD map; + uint32_t map; /* In pixel shaders, all private constants are program local, we don't need anything * from program.env. Thus we can advertise the full set of constants in pixel shaders. @@ -837,21 +837,27 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader } } - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (map & 1) shader_addline(buffer, "TEMP R%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "TEMP R%u;\n", i); } - for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + map = reg_maps->address; + while (map) { - if (map & 1) shader_addline(buffer, "ADDRESS A%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "ADDRESS A%u;\n", i); } if (pshader && reg_maps->shader_version.major == 1 && reg_maps->shader_version.minor <= 3) { - for (i = 0, map = reg_maps->texcoord; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) shader_addline(buffer, "TEMP T%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "TEMP T%u;\n", i); } }

1 0

Eric Pouech : msvcrt*: Use correct integral type.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: b7b841eb69d64715ef1aaab6ca69f1c6e3df7816 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b841eb69d64715ef1aaab6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Feb 1 14:05:09 2022 +0100 msvcrt*: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/details.c | 2 +- dlls/msvcp90/details.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 13a2fbbca96..59345c52871 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -434,7 +434,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; } diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2969516af4..6b54ea9597f 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -448,7 +448,7 @@ typedef struct compact_block /* Return the integer base-2 logarithm of (x|1). Result is 0 for x == 0. */ static inline unsigned int log2i(unsigned int x) { - unsigned int index; + ULONG index; BitScanReverse(&index, x|1); return index; }

1 0

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateDepthStencilView().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: a3c65a329e9d337999bb0ba2617d9e4a0d202c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c65a329e9d337999bb0ba2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:08:10 2022 +0300 d3d11: Always initialize out view pointer in CreateDepthStencilView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 2 ++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f8dcbb8cb47..a5f7f4202d5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2678,9 +2678,11 @@ static void test_create_depthstencil_view(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + dsview = (void *)0xdeadbeef; get_dsv_desc(&dsv_desc, &invalid_desc_tests[i].dsv_desc); hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!dsview, "Unexpected pointer %p.\n", dsview); ID3D10Texture2D_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7e5acc11824..92d4533b105 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3440,6 +3440,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (FAILED(hr = d3d_depthstencil_view_create(device, resource, desc, &object))) return hr; @@ -6103,6 +6105,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (desc) { d3d11_desc.Format = desc->Format; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ec385a92f50..93f0aa896e8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3788,9 +3788,11 @@ static void test_create_depthstencil_view(void) hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); ok(SUCCEEDED(hr), "Test %u: Failed to create 2d texture, hr %#x.\n", i, hr); + dsview = (void *)0xdeadbeef; get_dsv_desc(&dsv_desc, &invalid_desc_tests[i].dsv_desc); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, &dsv_desc, &dsview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!dsview, "Unexpected pointer %p.\n", dsview); ID3D11Texture2D_Release(texture); }

1 0

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateUnorderedAccessView().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: f467ebadd6140a360dd191ea496dbd978d94b00e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f467ebadd6140a360dd191ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:08:09 2022 +0300 d3d11: Always initialize out view pointer in CreateUnorderedAccessView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 2 ++ dlls/d3d11/tests/d3d11.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 858cd9f6d4a..7e5acc11824 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3399,6 +3399,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11De TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (FAILED(hr = d3d11_unordered_access_view_create(device, resource, desc, &object))) return hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 1db367f39fa..ec385a92f50 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19433,8 +19433,10 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + uav = (void *)0xdeadbeef; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, NULL, &uav); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!uav, "Unexpected pointer %p.\n", uav); expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); @@ -19483,8 +19485,10 @@ static void test_create_unordered_access_view(void) U(uav_desc).Buffer.NumElements = 64; U(uav_desc).Buffer.Flags = 0; + uav = (void *)0xdeadbeef; hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)buffer, &uav_desc, &uav); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!uav, "Unexpected pointer %p.\n", uav); ID3D11Buffer_Release(buffer); @@ -19579,9 +19583,11 @@ static void test_create_unordered_access_view(void) texture = (ID3D11Resource *)texture3d; } + uav = (void *)0xdeadbeef; get_uav_desc(&uav_desc, &invalid_desc_tests[i].uav_desc); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, &uav_desc, &uav); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!uav, "Unexpected pointer %p.\n", uav); ID3D11Resource_Release(texture); }

1 0

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateShaderResourceView().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: db6d549837c4481d2413fe26e3a6ec0b5999a076 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db6d549837c4481d2413fe26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 31 17:08:08 2022 +0300 d3d11: Always initialize out view pointer in CreateShaderResourceView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 6 ++++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index ea710038e17..f8dcbb8cb47 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -3555,8 +3555,10 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, D3D10_BIND_SHADER_RESOURCE, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, NULL, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p\n", srview); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; @@ -3586,8 +3588,10 @@ static void test_create_shader_resource_view(void) /* Without D3D10_BIND_SHADER_RESOURCE. */ buffer = create_buffer(device, 0, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p\n", srview); ID3D10Buffer_Release(buffer); @@ -3693,9 +3697,11 @@ static void test_create_shader_resource_view(void) texture = (ID3D10Resource *)texture3d; } + srview = (void *)0xdeadbeef; get_srv_desc(&srv_desc, &invalid_desc_tests[i].srv_desc); hr = ID3D10Device_CreateShaderResourceView(device, texture, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D10Resource_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f0cbb1741ab..858cd9f6d4a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3377,6 +3377,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Dev TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; @@ -6021,6 +6023,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10De TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 56747e7168c..1db367f39fa 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4371,16 +4371,20 @@ static void test_create_shader_resource_view(void) buffer = create_buffer(device, D3D11_BIND_SHADER_RESOURCE, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, NULL, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; U1(U(srv_desc).Buffer).ElementOffset = 0; U2(U(srv_desc).Buffer).ElementWidth = 64; + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, NULL, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); expected_refcount = get_refcount(device) + 1; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); @@ -4405,8 +4409,10 @@ static void test_create_shader_resource_view(void) /* Without D3D11_BIND_SHADER_RESOURCE. */ buffer = create_buffer(device, 0, 1024, NULL); + srview = (void *)0xdeadbeef; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D11Buffer_Release(buffer); @@ -4564,9 +4570,11 @@ static void test_create_shader_resource_view(void) texture = (ID3D11Resource *)texture3d; } + srview = (void *)0xdeadbeef; get_srv_desc(&srv_desc, &invalid_desc_tests[i].srv_desc); hr = ID3D11Device_CreateShaderResourceView(device, texture, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!srview, "Unexpected pointer %p.\n", srview); ID3D11Resource_Release(texture); }

1 0

Nikolay Sivov : xmllite: Fix long types warnings.
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 2848ce7621ae2dc699b781789f11f227069f0dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2848ce7621ae2dc699b78178… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 19:01:05 2022 +0300 xmllite: Fix long types warnings. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 1 - dlls/xmllite/reader.c | 24 ++++++++++++------------ dlls/xmllite/writer.c | 48 +++++++++++++++++++++++++----------------------- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/Makefile.in b/dlls/xmllite/Makefile.in index 003c36a3a37..aeb448162f6 100644 --- a/dlls/xmllite/Makefile.in +++ b/dlls/xmllite/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = xmllite.dll IMPORTLIB = xmllite diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 834c36ae18c..ccdc1ae2c1b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -840,7 +840,7 @@ static HRESULT readerinput_growraw(xmlreaderinput *readerinput) read = 0; hr = ISequentialStream_Read(readerinput->stream, buffer->data + buffer->written, len, &read); - TRACE("written=%d, alloc=%d, requested=%d, read=%d, ret=0x%08x\n", buffer->written, buffer->allocated, len, read, hr); + TRACE("written=%d, alloc=%d, requested=%ld, read=%ld, ret=%#lx\n", buffer->written, buffer->allocated, len, read, hr); readerinput->pending = hr == E_PENDING; if (FAILED(hr)) return hr; buffer->written += read; @@ -2579,7 +2579,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(reader->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", enc == XmlEncoding_Unknown ? "(unknown)" : + TRACE("detected encoding %s, %#lx.\n", enc == XmlEncoding_Unknown ? "(unknown)" : debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; @@ -2679,9 +2679,9 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) { - xmlreader *This = impl_from_IXmlReader(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreader *reader = impl_from_IXmlReader(iface); + ULONG ref = InterlockedIncrement(&reader->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -2725,7 +2725,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) xmlreader *This = impl_from_IXmlReader(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -2841,7 +2841,7 @@ static HRESULT WINAPI xmlreader_SetProperty(IXmlReader* iface, UINT property, LO { xmlreader *This = impl_from_IXmlReader(iface); - TRACE("(%p)->(%s 0x%lx)\n", This, debugstr_reader_prop(property), value); + TRACE("%p, %s, %Ix.\n", iface, debugstr_reader_prop(property), value); switch (property) { @@ -3590,9 +3590,9 @@ static HRESULT WINAPI xmlreaderinput_QueryInterface(IXmlReaderInput *iface, REFI static ULONG WINAPI xmlreaderinput_AddRef(IXmlReaderInput *iface) { - xmlreaderinput *This = impl_from_IXmlReaderInput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlreaderinput *input = impl_from_IXmlReaderInput(iface); + ULONG ref = InterlockedIncrement(&input->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -3601,7 +3601,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface) xmlreaderinput *This = impl_from_IXmlReaderInput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -3662,7 +3662,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlReader_QueryInterface(&reader->IXmlReader_iface, riid, obj); IXmlReader_Release(&reader->IXmlReader_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; } diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index e4553ccf01d..ac02bd4c200 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -549,7 +549,7 @@ static HRESULT writeroutput_flush_stream(xmlwriteroutput *output) written = 0; hr = ISequentialStream_Write(output->stream, buffer->data + offset, buffer->written, &written); if (FAILED(hr)) { - WARN("write to stream failed (0x%08x)\n", hr); + WARN("write to stream failed %#lx.\n", hr); buffer->written = 0; return hr; } @@ -700,28 +700,30 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedIncrement(&writer->ref); + TRACE("%p, refcount %lu.\n", iface, ref); return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { - xmlwriter *This = impl_from_IXmlWriter(iface); - ULONG ref = InterlockedDecrement(&This->ref); + xmlwriter *writer = impl_from_IXmlWriter(iface); + ULONG ref = InterlockedDecrement(&writer->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("%p, refcount %lu.\n", iface, ref); - if (ref == 0) { - IMalloc *imalloc = This->imalloc; + if (!ref) + { + IMalloc *imalloc = writer->imalloc; - writeroutput_flush_stream(This->output); - if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); + writeroutput_flush_stream(writer->output); + if (writer->output) + IUnknown_Release(&writer->output->IXmlWriterOutput_iface); - writer_free_element_stack(This); + writer_free_element_stack(writer); - writer_free(This, This); + writer_free(writer, writer); if (imalloc) IMalloc_Release(imalloc); } @@ -812,20 +814,20 @@ static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT property, LO static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT property, LONG_PTR value) { - xmlwriter *This = impl_from_IXmlWriter(iface); + xmlwriter *writer = impl_from_IXmlWriter(iface); - TRACE("(%p)->(%s %lu)\n", This, debugstr_writer_prop(property), value); + TRACE("%p, %s, %Id.\n", iface, debugstr_writer_prop(property), value); switch (property) { case XmlWriterProperty_Indent: - This->indent = !!value; + writer->indent = !!value; break; case XmlWriterProperty_ByteOrderMark: - This->bom = !!value; + writer->bom = !!value; break; case XmlWriterProperty_OmitXmlDeclaration: - This->omitxmldecl = !!value; + writer->omitxmldecl = !!value; break; default: FIXME("Unimplemented property (%u)\n", property); @@ -1822,9 +1824,9 @@ static HRESULT WINAPI xmlwriteroutput_QueryInterface(IXmlWriterOutput *iface, RE static ULONG WINAPI xmlwriteroutput_AddRef(IXmlWriterOutput *iface) { - xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); - ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + xmlwriteroutput *output = impl_from_IXmlWriterOutput(iface); + ULONG ref = InterlockedIncrement(&output->ref); + TRACE("%p, refcount %ld.\n", iface, ref); return ref; } @@ -1833,7 +1835,7 @@ static ULONG WINAPI xmlwriteroutput_Release(IXmlWriterOutput *iface) xmlwriteroutput *This = impl_from_IXmlWriterOutput(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (ref == 0) { @@ -1884,7 +1886,7 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc) hr = IXmlWriter_QueryInterface(&writer->IXmlWriter_iface, riid, obj); IXmlWriter_Release(&writer->IXmlWriter_iface); - TRACE("returning iface %p, hr %#x\n", *obj, hr); + TRACE("returning iface %p, hr %#lx.\n", *obj, hr); return hr; }

1 0

Nikolay Sivov : evr/presenter: Initial implementation of GetCurrentImage().
by Alexandre Julliard 01 Feb '22

01 Feb '22

Module: wine Branch: master Commit: 22fda5990ffc9b22258e914192d23fedf7d75dd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=22fda5990ffc9b22258e9141… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 1 18:59:07 2022 +0300 evr/presenter: Initial implementation of GetCurrentImage(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 910af2891e3..7e14cb2f720 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -65,6 +65,7 @@ struct sample_queue unsigned int used; unsigned int front; unsigned int back; + IMFSample *last_presented; }; struct streaming_thread @@ -120,6 +121,7 @@ struct video_presenter struct { int presented; + LONGLONG sampletime; } frame_stats; CRITICAL_SECTION cs; @@ -507,6 +509,13 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); presenter->frame_stats.presented++; + EnterCriticalSection(&presenter->cs); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); + presenter->thread.queue.last_presented = sample; + IMFSample_AddRef(presenter->thread.queue.last_presented); + LeaveCriticalSection(&presenter->cs); + IDirect3DDevice9_Release(device); IDirect3DSurface9_Release(backbuffer); IDirect3DSurface9_Release(surface); @@ -739,6 +748,8 @@ static HRESULT video_presenter_end_streaming(struct video_presenter *presenter) TRACE("Terminated streaming thread tid %#lx.\n", presenter->thread.tid); + if (presenter->thread.queue.last_presented) + IMFSample_Release(presenter->thread.queue.last_presented); memset(&presenter->thread, 0, sizeof(presenter->thread)); video_presenter_set_allocator_callback(presenter, NULL); @@ -1461,9 +1472,88 @@ static HRESULT WINAPI video_presenter_control_RepaintVideo(IMFVideoDisplayContro static HRESULT WINAPI video_presenter_control_GetCurrentImage(IMFVideoDisplayControl *iface, BITMAPINFOHEADER *header, BYTE **dib, DWORD *dib_size, LONGLONG *timestamp) { - FIXME("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); + IDirect3DSurface9 *readback = NULL, *surface; + D3DSURFACE_DESC surface_desc; + D3DLOCKED_RECT mapped_rect; + IDirect3DDevice9 *device; + IMFSample *sample; + LONG stride; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %p, %p, %p, %p.\n", iface, header, dib, dib_size, timestamp); + + EnterCriticalSection(&presenter->cs); + + sample = presenter->thread.queue.last_presented; + presenter->thread.queue.last_presented = NULL; + + if (!presenter->swapchain || !sample) + { + hr = MF_E_INVALIDREQUEST; + } + else if (SUCCEEDED(hr = video_presenter_get_sample_surface(sample, &surface))) + { + IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); + IDirect3DSurface9_GetDesc(surface, &surface_desc); + + if (surface_desc.Format != D3DFMT_X8R8G8B8) + { + FIXME("Unexpected surface format %d.\n", surface_desc.Format); + hr = E_FAIL; + } + + if (SUCCEEDED(hr)) + { + if (FAILED(hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, surface_desc.Width, + surface_desc.Height, D3DFMT_X8R8G8B8, D3DPOOL_SYSTEMMEM, &readback, NULL))) + { + WARN("Failed to create readback surface, hr %#lx.\n", hr); + } + } + + if (SUCCEEDED(hr)) + hr = IDirect3DDevice9_GetRenderTargetData(device, surface, readback); + + if (SUCCEEDED(hr)) + { + MFGetStrideForBitmapInfoHeader(D3DFMT_X8R8G8B8, surface_desc.Width, &stride); + *dib_size = abs(stride) * surface_desc.Height; + if (!(*dib = CoTaskMemAlloc(*dib_size))) + hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(readback, &mapped_rect, NULL, D3DLOCK_READONLY))) + { + memcpy(*dib, mapped_rect.pBits, *dib_size); + IDirect3DSurface9_UnlockRect(readback); + } + } + + memset(header, 0, sizeof(*header)); + header->biSize = sizeof(*header); + header->biWidth = surface_desc.Width; + header->biHeight = surface_desc.Height; + header->biPlanes = 1; + header->biBitCount = 32; + header->biSizeImage = *dib_size; + IMFSample_GetSampleTime(sample, timestamp); + + if (readback) + IDirect3DSurface9_Release(readback); + IDirect3DSurface9_Release(surface); + + IDirect3DDevice9_Release(device); + } + + if (sample) + IMFSample_Release(sample); + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_control_SetBorderColor(IMFVideoDisplayControl *iface, COLORREF color)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2022