June 2018 - Wine-devel - list.winehq.org

[PATCH 5/6] wined3d: Use WINED3D_LOCATION_DISCARDED before initializing buffers with data.
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e06d156c0b3f..4b14d684e542 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1354,7 +1354,7 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device } buffer->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, bind_flags); buffer->bind_flags = bind_flags; - buffer->locations = WINED3D_LOCATION_SYSMEM; + buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; if (!wined3d_resource_allocate_sysmem(&buffer->resource)) return E_OUTOFMEMORY; -- 2.16.4

2 1

[PATCH 4/6] wined3d: Reduce nesting in texture2d_load_sysmem().
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 521703314d0c..5502d055c263 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -198,7 +198,6 @@ static void texture2d_blt_fbo(const struct wined3d_device *device, struct wined3 else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); - if (src_location == WINED3D_LOCATION_DRAWABLE) { required_texture = src_texture; @@ -1655,21 +1654,18 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } - else - { - if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - /* Download the sub-resource to system memory. */ - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - wined3d_texture_bind_and_dirtify(texture, context, - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, context, dst_location); - ++texture->download_count; + if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - return TRUE; - } + /* Download the sub-resource to system memory. */ + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) + { + wined3d_texture_bind_and_dirtify(texture, context, + !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + texture2d_download_data(texture, sub_resource_idx, context, dst_location); + ++texture->download_count; + return TRUE; } if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) -- 2.16.4

2 1

[PATCH 2/6] wined3d: Initialize depth/stencil texture data.
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Fixes rendering glitches in Company of Heroes on radeonsi. --- dlls/wined3d/texture.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 91c703c970fd..c316906a9576 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2802,8 +2802,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (wined3d_texture_use_pbo(texture, gl_info)) texture->resource.map_binding = WINED3D_LOCATION_BUFFER; - if ((desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D || !wined3d_texture_use_pbo(texture, gl_info)) { if (!wined3d_resource_allocate_sysmem(&texture->resource)) @@ -2842,8 +2841,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc sub_resource = &texture->sub_resources[i]; sub_resource->locations = WINED3D_LOCATION_DISCARDED; - if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D - && !(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL)) + if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D) { wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_SYSMEM); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_SYSMEM); -- 2.16.4

2 1

[PATCH 3/6] d3d9/tests: Add test for depth stencil initialization.
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 95982e051556..b36c1890392c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -211,6 +211,34 @@ static DWORD getPixelColor(IDirect3DDevice9 *device, UINT x, UINT y) return ret; } +#define check_rt_color(a, b) check_rt_color_(__LINE__, a, b) +static void check_rt_color_(unsigned int line, IDirect3DSurface9 *rt, D3DCOLOR expected_color) +{ + struct surface_readback rb; + D3DSURFACE_DESC desc; + unsigned int x, y; + D3DCOLOR color; + HRESULT hr; + + hr = IDirect3DSurface9_GetDesc(rt, &desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (y = 0; y < desc.Height; ++y) + { + for (x = 0; x < desc.Width; ++x) + { + color = get_readback_color(&rb, x, y) & 0x00ffffff; + if (color != expected_color) + break; + } + if (color != expected_color) + break; + } + release_surface_readback(&rb); + ok_(__FILE__, line)(color == 0x000000ff, "Got unexpected color 0x%08x.\n", color); +} + static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -21406,6 +21434,92 @@ done: DestroyWindow(window); } +static void test_depth_stencil_init(void) +{ + IDirect3DDevice9 *device; + IDirect3DSurface9 *ds[2]; + IDirect3DSurface9 *rt; + IDirect3D9 *d3d; + ULONG refcount; + unsigned int i; + HWND window; + HRESULT hr; + + static const struct + { + struct vec3 position; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}}, + }; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == S_OK, "Failed to set color op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TFACTOR); + ok(hr == S_OK, "Failed to set color arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); + ok(hr == S_OK, "Failed to set FVF, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24S8, 0, 0, FALSE, &ds[0], NULL); + ok(hr == S_OK, "Failed to create depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetDepthStencilSurface(device, &ds[1]); + ok(hr == S_OK, "Failed to get depth stencil surface, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(ds); ++i) + { + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds[i]); + ok(hr == S_OK, "Failed to set depth stencil surface, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); + ok(hr == S_OK, "Failed to clear, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == S_OK, "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x000000ff); + ok(hr == S_OK, "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(hr == S_OK, "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == S_OK, "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(hr == S_OK, "Failed to get render target, hr %#x.\n", hr); + check_rt_color(rt, 0x000000ff); + IDirect3DSurface9_Release(rt); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(hr == D3D_OK, "Failed to present, hr %#x.\n", hr); + + IDirect3DSurface9_Release(ds[i]); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_texture_blending(void) { #define STATE_END() {0xffffffff, 0xffffffff} @@ -24037,6 +24151,7 @@ START_TEST(visual) test_flip(); test_uninitialized_varyings(); test_multisample_init(); + test_depth_stencil_init(); test_texture_blending(); test_color_clamping(); test_line_antialiasing_blending(); -- 2.16.4

3 2

[PATCH 1/6] d3d11: Introduce get_resource_properties() helper function.
by Józef Kucia 20 Jun '18

20 Jun '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/view.c | 259 +++++++++++++++++++----------------------------------- 1 file changed, 90 insertions(+), 169 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 164a1839e633..93d0b78655c1 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -25,6 +25,74 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); +static HRESULT get_resource_properties(ID3D11Resource *resource, D3D11_RESOURCE_DIMENSION *dimension, + DXGI_FORMAT *format, unsigned int *miplevel_count, unsigned int *layer_count) +{ + ID3D11Resource_GetType(resource, dimension); + switch (*dimension) + { + case D3D11_RESOURCE_DIMENSION_BUFFER: + return S_OK; + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + const struct d3d_texture1d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture1D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.ArraySize; + break; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: + { + const struct d3d_texture2d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture2D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.ArraySize; + break; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + { + const struct d3d_texture3d *texture; + + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) + { + ERR("Cannot get implementation from ID3D11Texture3D.\n"); + return E_FAIL; + } + + *format = texture->desc.Format; + if (miplevel_count) + *miplevel_count = texture->desc.MipLevels; + *layer_count = texture->desc.Depth; + break; + } + + default: + WARN("Invalid resource dimension %#x.\n", *dimension); + return E_INVALIDARG; + } + + return S_OK; +} + static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; @@ -113,10 +181,10 @@ static HRESULT set_dsv_desc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, I return S_OK; } - default: - ERR("Unhandled resource dimension %#x.\n", dimension); case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + default: + WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; } } @@ -126,36 +194,22 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_DSV_DIMENSION_TEXTURE2DMS @@ -164,26 +218,13 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_BUFFER: case D3D11_RESOURCE_DIMENSION_TEXTURE3D: + default: WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; - - default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -337,46 +378,30 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_RTV_DIMENSION_BUFFER) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMS @@ -385,42 +410,19 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.Depth; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -612,7 +614,7 @@ static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, } default: - ERR("Unhandled resource dimension %#x.\n", dimension); + WARN("Invalid resource dimension %#x.\n", dimension); return E_INVALIDARG; } } @@ -622,12 +624,13 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R unsigned int miplevel_count, layer_count; D3D11_RESOURCE_DIMENSION dimension; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, &miplevel_count, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFER && desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFEREX) { @@ -640,35 +643,17 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DARRAY && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMS @@ -679,44 +664,19 @@ static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11R WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - miplevel_count = texture->desc.MipLevels; - layer_count = 1; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -883,88 +843,49 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11 D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; DXGI_FORMAT format; + HRESULT hr; - ID3D11Resource_GetType(resource, &dimension); + if (FAILED(hr = get_resource_properties(resource, &dimension, &format, NULL, &layer_count))) + return hr; switch (dimension) { case D3D11_RESOURCE_DIMENSION_BUFFER: - { if (desc->ViewDimension != D3D11_UAV_DIMENSION_BUFFER) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } return S_OK; - } case D3D11_RESOURCE_DIMENSION_TEXTURE1D: - { - const struct d3d_texture1d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1D && desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE1DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture1D((ID3D11Texture1D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture1D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE2D: - { - const struct d3d_texture2d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE2D && desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE2DARRAY) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.ArraySize; break; - } case D3D11_RESOURCE_DIMENSION_TEXTURE3D: - { - const struct d3d_texture3d *texture; - if (desc->ViewDimension != D3D11_UAV_DIMENSION_TEXTURE3D) { WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); return E_INVALIDARG; } - - if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) - { - ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return E_FAIL; - } - - format = texture->desc.Format; - layer_count = texture->desc.Depth; break; - } default: - ERR("Unhandled resource dimension %#x.\n", dimension); - return E_FAIL; + WARN("Invalid resource dimension %#x.\n", dimension); + return E_INVALIDARG; } if (desc->Format == DXGI_FORMAT_UNKNOWN) -- 2.16.4

2 1

[PATCH 1/3] crypt32: Use ARRAY_SIZE macro.
by Nikolay Sivov 20 Jun '18

20 Jun '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/crypt32/cert.c | 3 +- dlls/crypt32/chain.c | 20 ++--- dlls/crypt32/crypt32_private.h | 2 + dlls/crypt32/decode.c | 89 +++++++++---------- dlls/crypt32/encode.c | 52 +++++------ dlls/crypt32/filestore.c | 3 +- dlls/crypt32/msg.c | 2 +- dlls/crypt32/object.c | 155 ++++++++++++--------------------- dlls/crypt32/oid.c | 9 +- dlls/crypt32/regstore.c | 9 +- dlls/crypt32/rootstore.c | 6 +- dlls/crypt32/sip.c | 5 +- dlls/crypt32/store.c | 7 +- dlls/crypt32/str.c | 6 +- 14 files changed, 150 insertions(+), 218 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index a4b43ff155..83aac5d8f4 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -987,8 +987,7 @@ static BOOL container_matches_cert(PCCERT_CONTEXT pCert, LPCSTR container, WCHAR containerW[MAX_PATH]; BOOL matches; - MultiByteToWideChar(CP_ACP, 0, container, -1, - containerW, sizeof(containerW) / sizeof(containerW[0])); + MultiByteToWideChar(CP_ACP, 0, container, -1, containerW, ARRAY_SIZE(containerW)); /* We make a copy of the CRYPT_KEY_PROV_INFO because the caller expects * keyProvInfo->pwszContainerName to be NULL or a heap-allocated container * name. diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index aab2e91583..dd3fc33db6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -146,9 +146,9 @@ HCERTCHAINENGINE CRYPT_CreateChainEngine(HCERTSTORE root, DWORD system_store, co worldStores[2] = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, myW); worldStores[3] = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, system_store, trustW); - CRYPT_AddStoresToCollection(engine->hWorld, sizeof(worldStores) / sizeof(worldStores[0]), worldStores); - CRYPT_AddStoresToCollection(engine->hWorld, config->cAdditionalStore, config->rghAdditionalStore); - CRYPT_CloseStores(sizeof(worldStores) / sizeof(worldStores[0]), worldStores); + CRYPT_AddStoresToCollection(engine->hWorld, ARRAY_SIZE(worldStores), worldStores); + CRYPT_AddStoresToCollection(engine->hWorld, config->cAdditionalStore, config->rghAdditionalStore); + CRYPT_CloseStores(ARRAY_SIZE(worldStores), worldStores); engine->dwFlags = config->dwFlags; engine->dwUrlRetrievalTimeout = config->dwUrlRetrievalTimeout; @@ -1688,11 +1688,9 @@ static LPCSTR filetime_to_str(const FILETIME *time) if (!time) return "(null)"; - GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(time, &sysTime); - GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatA(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); return wine_dbg_sprintf("%s", date); } @@ -3117,8 +3115,7 @@ static BOOL WINAPI verify_authenticode_policy(LPCSTR szPolicyOID, }; /* Check whether the root is an MS test root */ - for (i = 0; !isMSTestRoot && i < sizeof(keyBlobs) / sizeof(keyBlobs[0]); - i++) + for (i = 0; !isMSTestRoot && i < ARRAY_SIZE(keyBlobs); i++) { msPubKey.PublicKey.cbData = keyBlobs[i].cbData; msPubKey.PublicKey.pbData = keyBlobs[i].pbData; @@ -3408,7 +3405,7 @@ static BOOL match_dns_to_subject_dn(PCCERT_CONTEXT cert, LPCWSTR server_name) end = dot ? dot : ptr + strlenW(ptr); len = end - ptr; - if (len >= sizeof(component) / sizeof(component[0])) + if (len >= ARRAY_SIZE(component)) { WARN_(chain)("domain component %s too long\n", debugstr_wn(ptr, len)); @@ -3690,8 +3687,7 @@ static BOOL WINAPI verify_ms_root_policy(LPCSTR szPolicyOID, PCCERT_CONTEXT root = rootChain->rgpElement[rootChain->cElement - 1]->pCertContext; - for (i = 0; !isMSRoot && i < sizeof(keyBlobs) / sizeof(keyBlobs[0]); - i++) + for (i = 0; !isMSRoot && i < ARRAY_SIZE(keyBlobs); i++) { msPubKey.PublicKey.cbData = keyBlobs[i].cbData; msPubKey.PublicKey.pbData = keyBlobs[i].pbData; diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index 8b1b003a12..dbf6dca411 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -21,6 +21,8 @@ #include "wine/list.h" +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) + /* a few asn.1 tags we need */ #define ASN_BOOL (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x01) #define ASN_BITSTRING (ASN_UNIVERSAL | ASN_PRIMITIVE | 0x03) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 8b84388b12..a61316016f 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -890,7 +890,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertSignedContent(DWORD dwCertEncodingType, if (dwFlags & CRYPT_DECODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG) items[2].decodeFunc = CRYPT_AsnDecodeBitsInternal; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -935,7 +935,7 @@ static BOOL CRYPT_AsnDecodeValidity(const BYTE *pbEncoded, DWORD cbEncoded, CRYPT_AsnDecodeChoiceOfTimeInternal, sizeof(FILETIME), FALSE, FALSE, 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, NULL); return ret; @@ -1020,7 +1020,7 @@ static BOOL CRYPT_AsnDecodeCertInfo(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); if (ret && pvStructInfo) @@ -1135,7 +1135,7 @@ static BOOL CRYPT_AsnDecodeCRLEntry(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, entry, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, entry, pcbStructInfo, pcbDecoded, entry ? entry->SerialNumber.pbData : NULL); if (ret && entry && !entry->SerialNumber.cbData) @@ -1236,9 +1236,8 @@ static BOOL CRYPT_AsnDecodeCRLInfo(DWORD dwCertEncodingType, TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), - pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, - NULL, NULL); + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, + pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); TRACE("Returning %d (%08x)\n", ret, GetLastError()); return ret; @@ -1433,7 +1432,7 @@ static BOOL CRYPT_AsnDecodeExtension(const BYTE *pbEncoded, DWORD cbEncoded, if (ext) TRACE("ext->pszObjId is %p\n", ext->pszObjId); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, ext, pcbStructInfo, pcbDecoded, ext ? ext->pszObjId : NULL); if (ext) @@ -1871,7 +1870,7 @@ static BOOL CRYPT_AsnDecodeRdnAttr(const BYTE *pbEncoded, DWORD cbEncoded, if (attr) TRACE("attr->pszObjId is %p\n", attr->pszObjId); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, attr, pcbStructInfo, pcbDecoded, attr ? attr->pszObjId : NULL); if (attr) @@ -1968,7 +1967,7 @@ static BOOL CRYPT_AsnDecodeUnicodeRdnAttr(const BYTE *pbEncoded, if (attr) TRACE("attr->pszObjId is %p\n", attr->pszObjId); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, attr, pcbStructInfo, pcbDecoded, attr ? attr->pszObjId : NULL); if (attr) @@ -2197,7 +2196,7 @@ static BOOL CRYPT_AsnDecodeCTLEntry(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, entry, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, entry, pcbStructInfo, pcbDecoded, entry ? entry->SubjectIdentifier.pbData : NULL); return ret; @@ -2300,7 +2299,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCTL(DWORD dwCertEncodingType, TRUE, TRUE, offsetof(CTL_INFO, rgExtension), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -2330,7 +2329,7 @@ static BOOL CRYPT_AsnDecodeSMIMECapability(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, capability ? capability->pszObjId : NULL); TRACE("returning %d\n", ret); @@ -2460,7 +2459,7 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, NULL, &bytesNeeded, pcbDecoded, NULL); if (ret) @@ -2496,10 +2495,8 @@ static BOOL CRYPT_AsnDecodeNoticeReference(const BYTE *pbEncoded, *(PCERT_POLICY_QUALIFIER_NOTICE_REFERENCE *)pvStructInfo; noticeRef->pszOrganization = (LPSTR)((LPBYTE)noticeRef + sizeof(CERT_POLICY_QUALIFIER_NOTICE_REFERENCE)); - ret = CRYPT_AsnDecodeSequence(items, - sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, - NULL, noticeRef, &bytesNeeded, pcbDecoded, - noticeRef->pszOrganization); + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, + NULL, noticeRef, &bytesNeeded, pcbDecoded, noticeRef->pszOrganization); } } TRACE("returning %d\n", ret); @@ -2653,7 +2650,7 @@ static BOOL CRYPT_AsnDecodePolicyQualifierUserNoticeInternal( TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, notice ? notice->pNoticeReference : NULL); TRACE("returning %d\n", ret); @@ -2748,7 +2745,7 @@ static BOOL CRYPT_AsnDecodePKCSAttributeInternal(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, attr ? attr->pszObjId : NULL); TRACE("returning %d\n", ret); @@ -2866,7 +2863,7 @@ static BOOL CRYPT_AsnDecodeAlgorithmId(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, algo ? algo->pszObjId : NULL); if (ret && pvStructInfo) @@ -2893,7 +2890,7 @@ static BOOL CRYPT_AsnDecodePubKeyInfoInternal(const BYTE *pbEncoded, }; PCERT_PUBLIC_KEY_INFO info = pvStructInfo; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->Algorithm.Parameters.pbData : NULL); return ret; @@ -3150,7 +3147,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId(DWORD dwCertEncodingType, offsetof(CERT_AUTHORITY_KEY_ID_INFO, CertSerialNumber.pbData), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -3187,7 +3184,7 @@ static BOOL WINAPI CRYPT_AsnDecodeAuthorityKeyId2(DWORD dwCertEncodingType, AuthorityCertSerialNumber.pbData), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -3214,7 +3211,7 @@ static BOOL CRYPT_AsnDecodeAccessDescription(const BYTE *pbEncoded, }; CERT_ACCESS_DESCRIPTION *descr = pvStructInfo; - return CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + return CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, descr ? descr->pszAccessMethod : NULL); } @@ -3323,7 +3320,7 @@ static BOOL CRYPT_AsnDecodePKCSContentInfoInternal(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->pszObjId : NULL); return ret; @@ -3392,7 +3389,7 @@ BOOL CRYPT_AsnDecodePKCSDigestedData(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CRYPT_DIGESTED_DATA, hash.pbData), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, digestedData, pcbDigestedData, NULL, NULL); return ret; @@ -3531,7 +3528,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints(DWORD dwCertEncodingType, offsetof(CERT_BASIC_CONSTRAINTS_INFO, rgSubtreesConstraint), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -3560,7 +3557,7 @@ static BOOL WINAPI CRYPT_AsnDecodeBasicConstraints2(DWORD dwCertEncodingType, sizeof(struct PATH_LEN_CONSTRAINT), TRUE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -3592,7 +3589,7 @@ static BOOL CRYPT_AsnDecodePolicyQualifier(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, qualifier ? qualifier->pszPolicyQualifierId : NULL); return ret; @@ -3637,7 +3634,7 @@ static BOOL CRYPT_AsnDecodeCertPolicy(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->pszPolicyIdentifier : NULL); return ret; @@ -3694,7 +3691,7 @@ static BOOL CRYPT_AsnDecodeCertPolicyMapping(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, pvStructInfo ? *pcbStructInfo : 0); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, mapping ? mapping->pszIssuerDomainPolicy : NULL); return ret; @@ -3851,7 +3848,7 @@ static BOOL WINAPI CRYPT_AsnDecodeCertPolicyConstraints( TRUE, FALSE, 0, 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -3890,7 +3887,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPubKey(DWORD dwCertEncodingType, struct DECODED_RSA_PUB_KEY *decodedKey = NULL; DWORD size = 0; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, &size, NULL, NULL); if (ret) @@ -3998,7 +3995,7 @@ static BOOL WINAPI CRYPT_AsnDecodeRsaPrivKey(DWORD dwCertEncodingType, struct DECODED_RSA_PRIV_KEY *decodedKey = NULL; DWORD size = 0; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, &decodedKey, &size, NULL, NULL); if (ret) @@ -5242,7 +5239,7 @@ static BOOL CRYPT_AsnDecodeDistPoint(const BYTE *pbEncoded, DWORD cbEncoded, CRL_DIST_POINT *point = pvStructInfo; BOOL ret; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, point ? point->DistPointName.u.FullName.rgAltEntry : NULL); return ret; @@ -5344,7 +5341,7 @@ static BOOL WINAPI CRYPT_AsnDecodeIssuingDistPoint(DWORD dwCertEncodingType, fIndirectCRL), CRYPT_AsnDecodeBool, sizeof(BOOL), TRUE, FALSE, 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -5427,7 +5424,7 @@ static BOOL CRYPT_AsnDecodeSubtree(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, subtree ? subtree->Base.u.pwszURL : NULL); if (pcbDecoded) @@ -5508,7 +5505,7 @@ static BOOL WINAPI CRYPT_AsnDecodeNameConstraints(DWORD dwCertEncodingType, offsetof(CERT_NAME_CONSTRAINTS_INFO, rgExcludedSubtree), 0 }, }; - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, pvStructInfo, pcbStructInfo, NULL, NULL); } @@ -5538,7 +5535,7 @@ static BOOL CRYPT_AsnDecodeIssuerSerialNumber(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, issuerSerial ? issuerSerial->Issuer.pbData : NULL); if (ret && issuerSerial && !issuerSerial->SerialNumber.cbData) @@ -5585,7 +5582,7 @@ static BOOL CRYPT_AsnDecodePKCSSignerInfoInternal(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->Issuer.pbData : NULL); return ret; @@ -5751,7 +5748,7 @@ static BOOL CRYPT_AsnDecodeCMSSignerInfoInternal(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->SignerId.u.KeyId.pbData : NULL); return ret; @@ -5851,7 +5848,7 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, signedInfo, pcbSignedInfo); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, signedInfo, pcbSignedInfo, NULL, NULL); TRACE("returning %d\n", ret); @@ -5884,7 +5881,7 @@ static BOOL CRYPT_AsnDecodeRecipientInfo(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->RecipientId.u.IssuerSerialNumber.Issuer.pbData : NULL); @@ -5941,7 +5938,7 @@ static BOOL CRYPT_AsnDecodeEncryptedContentInfo(const BYTE *pbEncoded, TRACE("%p, %d, %08x, %p, %d, %p\n", pbEncoded, cbEncoded, dwFlags, pvStructInfo, *pcbStructInfo, pcbDecoded); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, NULL, pvStructInfo, pcbStructInfo, pcbDecoded, info ? info->contentType : NULL); TRACE("returning %d\n", ret); @@ -5969,7 +5966,7 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, pDecodePara, envelopedData, pcbEnvelopedData); - ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnDecodeSequence(items, ARRAY_SIZE(items), pbEncoded, cbEncoded, dwFlags, pDecodePara, envelopedData, pcbEnvelopedData, NULL, NULL); TRACE("returning %d\n", ret); diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 6f9f595f4f..62d2bc91f7 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -372,7 +372,7 @@ static BOOL WINAPI CRYPT_AsnEncodeValidity(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -400,7 +400,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmIdWithNullParams( else items[1].pvStructInfo = &nullBlob; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -417,7 +417,7 @@ static BOOL WINAPI CRYPT_AsnEncodeAlgorithmId(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -439,7 +439,7 @@ static BOOL WINAPI CRYPT_AsnEncodePubKeyInfo(DWORD dwCertEncodingType, TRACE("Encoding public key with OID %s\n", debugstr_a(info->Algorithm.pszObjId)); ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT @@ -469,7 +469,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCert(DWORD dwCertEncodingType, if (dwFlags & CRYPT_ENCODE_NO_SIGNATURE_BYTE_REVERSAL_FLAG) items[2].encodeFunc = CRYPT_AsnEncodeBits; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } __EXCEPT_PAGE_FAULT @@ -495,7 +495,7 @@ BOOL WINAPI CRYPT_AsnEncodePubKeyInfoNoNull(DWORD dwCertEncodingType, TRACE("Encoding public key with OID %s\n", debugstr_a(info->Algorithm.pszObjId)); ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -1530,7 +1530,7 @@ static BOOL CRYPT_AsnEncodeCTLEntry(const CTL_ENTRY *entry, BOOL ret; ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, - sizeof(items) / sizeof(items[0]), 0, NULL, pbEncoded, pcbEncoded); + ARRAY_SIZE(items), 0, NULL, pbEncoded, pcbEncoded); return ret; } @@ -1679,7 +1679,7 @@ static BOOL CRYPT_AsnEncodeSMIMECapability(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } } @@ -1822,7 +1822,7 @@ static BOOL WINAPI CRYPT_AsnEncodeNoticeReference(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -1887,7 +1887,7 @@ static BOOL WINAPI CRYPT_AsnEncodePKCSAttribute(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } } @@ -1960,8 +1960,7 @@ BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData, { &digestedData->hash, CRYPT_AsnEncodeOctets, 0 }, }; - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, - sizeof(items) / sizeof(items[0]), 0, NULL, pvData, pcbData); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), 0, NULL, pvData, pcbData); } static BOOL WINAPI CRYPT_AsnEncodePKCSContentInfo(DWORD dwCertEncodingType, @@ -2708,8 +2707,7 @@ static BOOL CRYPT_AsnEncodeAccessDescription( SetLastError(E_INVALIDARG); return FALSE; } - return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, - sizeof(items) / sizeof(items[0]), 0, NULL, pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, ARRAY_SIZE(items), 0, NULL, pbEncoded, pcbEncoded); } static BOOL WINAPI CRYPT_AsnEncodeAuthorityInfoAccess(DWORD dwCertEncodingType, @@ -2877,8 +2875,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, items[0].pvStructInfo = info->rgPolicyQualifier[i].pszPolicyQualifierId; items[1].pvStructInfo = &info->rgPolicyQualifier[i].Qualifier; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, NULL, &size); if (ret) bytesNeeded += size; @@ -2909,8 +2906,7 @@ static BOOL WINAPI CRYPT_AsnEncodeCertPolicyQualifiers(DWORD dwCertEncodingType, items[1].pvStructInfo = &info->rgPolicyQualifier[i].Qualifier; size = bytesNeeded; - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), dwFlags & ~CRYPT_ENCODE_ALLOC_FLAG, NULL, out, &size); if (ret) { @@ -2942,8 +2938,7 @@ static BOOL CRYPT_AsnEncodeCertPolicy(DWORD dwCertEncodingType, SetLastError(E_INVALIDARG); return FALSE; } - ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, NULL, pbEncoded, pcbEncoded); + ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), dwFlags, NULL, pbEncoded, pcbEncoded); return ret; } @@ -3026,8 +3021,7 @@ static BOOL CRYPT_AsnEncodeCertPolicyMapping(DWORD dwCertEncodingType, SetLastError(E_INVALIDARG); return FALSE; } - return CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, NULL, pbEncoded, pcbEncoded); + return CRYPT_AsnEncodeSequence(dwCertEncodingType, items, ARRAY_SIZE(items), dwFlags, NULL, pbEncoded, pcbEncoded); } static BOOL WINAPI CRYPT_AsnEncodeCertPolicyMappings(DWORD dwCertEncodingType, @@ -3169,8 +3163,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRsaPubKey(DWORD dwCertEncodingType, }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, - pcbEncoded); + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } } __EXCEPT_PAGE_FAULT @@ -4151,8 +4144,7 @@ static BOOL WINAPI CRYPT_AsnEncodeIssuerSerialNumber( }; ret = CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, - pcbEncoded); + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); return ret; } @@ -4402,8 +4394,7 @@ static BOOL WINAPI CRYPT_AsnEncodeRecipientInfo(DWORD dwCertEncodingType, }; return CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, - pcbEncoded); + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } static BOOL WINAPI CRYPT_AsnEncodeEncryptedContentInfo(DWORD dwCertEncodingType, @@ -4421,8 +4412,7 @@ static BOOL WINAPI CRYPT_AsnEncodeEncryptedContentInfo(DWORD dwCertEncodingType, }; return CRYPT_AsnEncodeSequence(dwCertEncodingType, items, - sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded, - pcbEncoded); + ARRAY_SIZE(items), dwFlags, pEncodePara, pbEncoded, pcbEncoded); } BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData, @@ -4439,7 +4429,7 @@ BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData, }; return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, - sizeof(items) / sizeof(items[0]), 0, NULL, pvData, pcbData); + ARRAY_SIZE(items), 0, NULL, pvData, pcbData); } static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType, diff --git a/dlls/crypt32/filestore.c b/dlls/crypt32/filestore.c index 0f7d8d5150..9c211e14b1 100644 --- a/dlls/crypt32/filestore.c +++ b/dlls/crypt32/filestore.c @@ -231,8 +231,7 @@ static WINECRYPT_CERTSTORE *CRYPT_CreateFileStore(DWORD dwFlags, info->type = type; info->dirty = FALSE; provInfo.cbSize = sizeof(provInfo); - provInfo.cStoreProvFunc = sizeof(fileProvFuncs) / - sizeof(fileProvFuncs[0]); + provInfo.cStoreProvFunc = ARRAY_SIZE(fileProvFuncs); provInfo.rgpvStoreProvFunc = fileProvFuncs; provInfo.hStoreProv = info; store = CRYPT_ProvCreateStore(dwFlags, memStore, &provInfo); diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index fd43a7baeb..005fbf2c1f 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -175,7 +175,7 @@ static BOOL CRYPT_EncodeDataContentInfoHeader(const CDataEncodeMsg *msg, }; ret = CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items, - sizeof(items) / sizeof(items[0]), CRYPT_ENCODE_ALLOC_FLAG, NULL, + ARRAY_SIZE(items), CRYPT_ENCODE_ALLOC_FLAG, NULL, (LPBYTE)&header->pbData, &header->cbData); if (ret) { diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 0320cfda1b..3dc28af0e9 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -929,8 +929,7 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; DWORD bytesNeeded = sizeof(WCHAR); - LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, - sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, ARRAY_SIZE(infoNotAvailable)); if (!bits->cbData || bits->cbData > 2) { bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); @@ -959,26 +958,18 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, if (!stringsLoaded) { - for (i = 0; - i < sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]); - i++) - LoadStringW(hInstance, keyUsageByte0Map[i].id, - keyUsageByte0Map[i].str, MAX_STRING_RESOURCE_LEN); - for (i = 0; - i < sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]); - i++) - LoadStringW(hInstance, keyUsageByte1Map[i].id, - keyUsageByte1Map[i].str, MAX_STRING_RESOURCE_LEN); + for (i = 0; i < ARRAY_SIZE(keyUsageByte0Map); i++) + LoadStringW(hInstance, keyUsageByte0Map[i].id, keyUsageByte0Map[i].str, MAX_STRING_RESOURCE_LEN); + for (i = 0; i < ARRAY_SIZE(keyUsageByte1Map); i++) + LoadStringW(hInstance, keyUsageByte1Map[i].id, keyUsageByte1Map[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, - sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), - NULL, &bitStringLen, &first); + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, ARRAY_SIZE(keyUsageByte0Map), + NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; if (bits->cbData == 2) { - CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, - sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, ARRAY_SIZE(keyUsageByte1Map), NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; } @@ -1000,15 +991,13 @@ static BOOL WINAPI CRYPT_FormatKeyUsage(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, - sizeof(keyUsageByte0Map) / sizeof(keyUsageByte0Map[0]), + CRYPT_FormatBits(bits->pbData[0], keyUsageByte0Map, ARRAY_SIZE(keyUsageByte0Map), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; if (bits->cbData == 2) { bitStringLen = bytesNeeded; - CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, - sizeof(keyUsageByte1Map) / sizeof(keyUsageByte1Map[0]), + CRYPT_FormatBits(bits->pbData[1], keyUsageByte1Map, ARRAY_SIZE(keyUsageByte1Map), str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; } @@ -1070,15 +1059,10 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, if (!stringsLoaded) { - LoadStringW(hInstance, IDS_SUBJECT_TYPE, subjectTypeHeader, - sizeof(subjectTypeHeader) / sizeof(subjectTypeHeader[0])); - LoadStringW(hInstance, IDS_SUBJECT_TYPE_CA, subjectTypeCA, - sizeof(subjectTypeCA) / sizeof(subjectTypeCA[0])); - LoadStringW(hInstance, IDS_SUBJECT_TYPE_END_CERT, - subjectTypeEndCert, - sizeof(subjectTypeEndCert) / sizeof(subjectTypeEndCert[0])); - LoadStringW(hInstance, IDS_PATH_LENGTH, pathLengthHeader, - sizeof(pathLengthHeader) / sizeof(pathLengthHeader[0])); + LoadStringW(hInstance, IDS_SUBJECT_TYPE, subjectTypeHeader, ARRAY_SIZE(subjectTypeHeader)); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_CA, subjectTypeCA, ARRAY_SIZE(subjectTypeCA)); + LoadStringW(hInstance, IDS_SUBJECT_TYPE_END_CERT, subjectTypeEndCert, ARRAY_SIZE(subjectTypeEndCert)); + LoadStringW(hInstance, IDS_PATH_LENGTH, pathLengthHeader, ARRAY_SIZE(pathLengthHeader)); stringsLoaded = TRUE; } bytesNeeded += strlenW(subjectTypeHeader) * sizeof(WCHAR); @@ -1092,8 +1076,7 @@ static BOOL WINAPI CRYPT_FormatBasicConstraints2(DWORD dwCertEncodingType, if (info->fPathLenConstraint) sprintfW(pathLength, pathFmt, info->dwPathLenConstraint); else - LoadStringW(hInstance, IDS_PATH_LENGTH_NONE, pathLength, - sizeof(pathLength) / sizeof(pathLength[0])); + LoadStringW(hInstance, IDS_PATH_LENGTH_NONE, pathLength, ARRAY_SIZE(pathLength)); bytesNeeded += strlenW(pathLength) * sizeof(WCHAR); if (!pbFormat) *pcbFormat = bytesNeeded; @@ -1130,7 +1113,7 @@ static BOOL CRYPT_FormatHexStringWithPrefix(const CRYPT_DATA_BLOB *blob, int id, DWORD bytesNeeded; BOOL ret; - LoadStringW(hInstance, id, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, id, buf, ARRAY_SIZE(buf)); CRYPT_FormatHexString(X509_ASN_ENCODING, 0, 0, NULL, NULL, blob->pbData, blob->cbData, NULL, &bytesNeeded); bytesNeeded += strlenW(buf) * sizeof(WCHAR); @@ -1189,14 +1172,12 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, switch (entry->dwAltNameChoice) { case CERT_ALT_NAME_RFC822_NAME: - LoadStringW(hInstance, IDS_ALT_NAME_RFC822_NAME, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALT_NAME_RFC822_NAME, buf, ARRAY_SIZE(buf)); bytesNeeded += strlenW(entry->u.pwszRfc822Name) * sizeof(WCHAR); ret = TRUE; break; case CERT_ALT_NAME_DNS_NAME: - LoadStringW(hInstance, IDS_ALT_NAME_DNS_NAME, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALT_NAME_DNS_NAME, buf, ARRAY_SIZE(buf)); bytesNeeded += strlenW(entry->u.pwszDNSName) * sizeof(WCHAR); ret = TRUE; break; @@ -1208,8 +1189,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, strType |= CERT_NAME_STR_CRLF_FLAG; directoryNameLen = cert_name_to_str_with_indent(X509_ASN_ENCODING, indentLevel + 1, &entry->u.DirectoryName, strType, NULL, 0); - LoadStringW(hInstance, IDS_ALT_NAME_DIRECTORY_NAME, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALT_NAME_DIRECTORY_NAME, buf, ARRAY_SIZE(buf)); bytesNeeded += (directoryNameLen - 1) * sizeof(WCHAR); if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) bytesNeeded += strlenW(colonCrlf) * sizeof(WCHAR); @@ -1219,8 +1199,7 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, break; } case CERT_ALT_NAME_URL: - LoadStringW(hInstance, IDS_ALT_NAME_URL, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALT_NAME_URL, buf, ARRAY_SIZE(buf)); bytesNeeded += strlenW(entry->u.pwszURL) * sizeof(WCHAR); ret = TRUE; break; @@ -1232,14 +1211,12 @@ static BOOL CRYPT_FormatAltNameEntry(DWORD dwFormatStrType, DWORD indentLevel, static const WCHAR ipAddrFmt[] = { '%','d','.','%','d','.','%','d', '.','%','d',0 }; - LoadStringW(hInstance, IDS_ALT_NAME_IP_ADDRESS, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALT_NAME_IP_ADDRESS, buf, ARRAY_SIZE(buf)); if (entry->u.IPAddress.cbData == 8) { if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) { - LoadStringW(hInstance, IDS_ALT_NAME_MASK, mask, - sizeof(mask) / sizeof(mask[0])); + LoadStringW(hInstance, IDS_ALT_NAME_MASK, mask, ARRAY_SIZE(mask)); bytesNeeded += strlenW(mask) * sizeof(WCHAR); sprintfW(ipAddrBuf, ipAddrFmt, entry->u.IPAddress.pbData[0], @@ -1448,7 +1425,7 @@ static BOOL CRYPT_FormatCertIssuer(DWORD dwFormatStrType, LPCWSTR sep; BOOL ret; - LoadStringW(hInstance, IDS_CERT_ISSUER, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_CERT_ISSUER, buf, ARRAY_SIZE(buf)); ret = CRYPT_FormatAltNameInfo(dwFormatStrType, 1, issuer, NULL, &bytesNeeded); bytesNeeded += strlenW(buf) * sizeof(WCHAR); @@ -1652,8 +1629,7 @@ static BOOL WINAPI CRYPT_FormatAuthorityInfoAccess(DWORD dwCertEncodingType, { WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; - LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, - sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, ARRAY_SIZE(infoNotAvailable)); bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); if (!pbFormat) *pcbFormat = bytesNeeded; @@ -1680,18 +1656,12 @@ static BOOL WINAPI CRYPT_FormatAuthorityInfoAccess(DWORD dwCertEncodingType, if (!stringsLoaded) { - LoadStringW(hInstance, IDS_AIA, aia, - sizeof(aia) / sizeof(aia[0])); - LoadStringW(hInstance, IDS_ACCESS_METHOD, accessMethod, - sizeof(accessMethod) / sizeof(accessMethod[0])); - LoadStringW(hInstance, IDS_ACCESS_METHOD_OCSP, ocsp, - sizeof(ocsp) / sizeof(ocsp[0])); - LoadStringW(hInstance, IDS_ACCESS_METHOD_CA_ISSUERS, caIssuers, - sizeof(caIssuers) / sizeof(caIssuers[0])); - LoadStringW(hInstance, IDS_ACCESS_METHOD_UNKNOWN, unknown, - sizeof(unknown) / sizeof(unknown[0])); - LoadStringW(hInstance, IDS_ACCESS_LOCATION, accessLocation, - sizeof(accessLocation) / sizeof(accessLocation[0])); + LoadStringW(hInstance, IDS_AIA, aia, ARRAY_SIZE(aia)); + LoadStringW(hInstance, IDS_ACCESS_METHOD, accessMethod, ARRAY_SIZE(accessMethod)); + LoadStringW(hInstance, IDS_ACCESS_METHOD_OCSP, ocsp, ARRAY_SIZE(ocsp)); + LoadStringW(hInstance, IDS_ACCESS_METHOD_CA_ISSUERS, caIssuers, ARRAY_SIZE(caIssuers)); + LoadStringW(hInstance, IDS_ACCESS_METHOD_UNKNOWN, unknown, ARRAY_SIZE(unknown)); + LoadStringW(hInstance, IDS_ACCESS_LOCATION, accessLocation, ARRAY_SIZE(accessLocation)); stringsLoaded = TRUE; } if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) @@ -1879,7 +1849,7 @@ static BOOL CRYPT_FormatReason(DWORD dwFormatStrType, if (!stringsLoaded) { - for (i = 0; i < sizeof(reason_map) / sizeof(reason_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(reason_map); i++) LoadStringW(hInstance, reason_map[i].id, reason_map[i].reason, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; @@ -1887,7 +1857,7 @@ static BOOL CRYPT_FormatReason(DWORD dwFormatStrType, /* No need to check reasonFlags->cbData, we already know it's positive. * Ignore any other bytes, as they're for undefined bits. */ - for (i = 0; i < sizeof(reason_map) / sizeof(reason_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(reason_map); i++) { if (reasonFlags->pbData[0] & reason_map[i].reasonBit) { @@ -1909,14 +1879,13 @@ static BOOL CRYPT_FormatReason(DWORD dwFormatStrType, else { *pcbStr = bytesNeeded; - for (i = 0; i < sizeof(reason_map) / sizeof(reason_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(reason_map); i++) { if (reasonFlags->pbData[0] & reason_map[i].reasonBit) { strcpyW(str, reason_map[i].reason); str += strlenW(reason_map[i].reason); - if (i < sizeof(reason_map) / sizeof(reason_map[0]) - 1 && - numReasons) + if (i < ARRAY_SIZE(reason_map) - 1 && numReasons) { strcpyW(str, sep); str += strlenW(sep); @@ -1963,18 +1932,12 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, if (!stringsLoaded) { - LoadStringW(hInstance, IDS_CRL_DIST_POINT, crlDistPoint, - sizeof(crlDistPoint) / sizeof(crlDistPoint[0])); - LoadStringW(hInstance, IDS_CRL_DIST_POINT_NAME, distPointName, - sizeof(distPointName) / sizeof(distPointName[0])); - LoadStringW(hInstance, IDS_CRL_DIST_POINT_FULL_NAME, fullName, - sizeof(fullName) / sizeof(fullName[0])); - LoadStringW(hInstance, IDS_CRL_DIST_POINT_RDN_NAME, rdnName, - sizeof(rdnName) / sizeof(rdnName[0])); - LoadStringW(hInstance, IDS_CRL_DIST_POINT_REASON, reason, - sizeof(reason) / sizeof(reason[0])); - LoadStringW(hInstance, IDS_CRL_DIST_POINT_ISSUER, issuer, - sizeof(issuer) / sizeof(issuer[0])); + LoadStringW(hInstance, IDS_CRL_DIST_POINT, crlDistPoint, ARRAY_SIZE(crlDistPoint)); + LoadStringW(hInstance, IDS_CRL_DIST_POINT_NAME, distPointName, ARRAY_SIZE(distPointName)); + LoadStringW(hInstance, IDS_CRL_DIST_POINT_FULL_NAME, fullName, ARRAY_SIZE(fullName)); + LoadStringW(hInstance, IDS_CRL_DIST_POINT_RDN_NAME, rdnName, ARRAY_SIZE(rdnName)); + LoadStringW(hInstance, IDS_CRL_DIST_POINT_REASON, reason, ARRAY_SIZE(reason)); + LoadStringW(hInstance, IDS_CRL_DIST_POINT_ISSUER, issuer, ARRAY_SIZE(issuer)); stringsLoaded = TRUE; } if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) @@ -2050,8 +2013,7 @@ static BOOL WINAPI CRYPT_FormatCRLDistPoints(DWORD dwCertEncodingType, { WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; - LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, - sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, ARRAY_SIZE(infoNotAvailable)); bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); if (!pbFormat) *pcbFormat = bytesNeeded; @@ -2202,8 +2164,7 @@ static BOOL WINAPI CRYPT_FormatEnhancedKeyUsage(DWORD dwCertEncodingType, sepLen = strlenW(commaSpace) * sizeof(WCHAR); } - LoadStringW(hInstance, IDS_USAGE_UNKNOWN, unknown, - sizeof(unknown) / sizeof(unknown[0])); + LoadStringW(hInstance, IDS_USAGE_UNKNOWN, unknown, ARRAY_SIZE(unknown)); for (i = 0; i < usage->cUsageIdentifier; i++) { PCCRYPT_OID_INFO info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, @@ -2299,8 +2260,7 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, WCHAR infoNotAvailable[MAX_STRING_RESOURCE_LEN]; DWORD bytesNeeded = sizeof(WCHAR); - LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, - sizeof(infoNotAvailable) / sizeof(infoNotAvailable[0])); + LoadStringW(hInstance, IDS_INFO_NOT_AVAILABLE, infoNotAvailable, ARRAY_SIZE(infoNotAvailable)); if (!bits->cbData || bits->cbData > 1) { bytesNeeded += strlenW(infoNotAvailable) * sizeof(WCHAR); @@ -2329,15 +2289,13 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, if (!stringsLoaded) { - for (i = 0; i < sizeof(netscapeCertTypeMap) / - sizeof(netscapeCertTypeMap[0]); i++) + for (i = 0; i < ARRAY_SIZE(netscapeCertTypeMap); i++) LoadStringW(hInstance, netscapeCertTypeMap[i].id, netscapeCertTypeMap[i].str, MAX_STRING_RESOURCE_LEN); stringsLoaded = TRUE; } - CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, - sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), - NULL, &bitStringLen, &first); + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, ARRAY_SIZE(netscapeCertTypeMap), + NULL, &bitStringLen, &first); bytesNeeded += bitStringLen; bytesNeeded += 3 * sizeof(WCHAR); /* " (" + ")" */ CRYPT_FormatHexString(0, 0, 0, NULL, NULL, bits->pbData, @@ -2357,9 +2315,8 @@ static BOOL WINAPI CRYPT_FormatNetscapeCertType(DWORD dwCertEncodingType, bitStringLen = bytesNeeded; first = TRUE; - CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, - sizeof(netscapeCertTypeMap) / sizeof(netscapeCertTypeMap[0]), - str, &bitStringLen, &first); + CRYPT_FormatBits(bits->pbData[0], netscapeCertTypeMap, ARRAY_SIZE(netscapeCertTypeMap), + str, &bitStringLen, &first); str += bitStringLen / sizeof(WCHAR) - 1; *str++ = ' '; *str++ = '('; @@ -2407,16 +2364,12 @@ static BOOL WINAPI CRYPT_FormatSpcFinancialCriteria(DWORD dwCertEncodingType, if (!stringsLoaded) { - LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA, financialCriteria, - sizeof(financialCriteria) / sizeof(financialCriteria[0])); - LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_AVAILABLE, available, - sizeof(available) / sizeof(available[0])); - LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE, - notAvailable, sizeof(notAvailable) / sizeof(notAvailable[0])); - LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA, - meetsCriteria, sizeof(meetsCriteria) / sizeof(meetsCriteria[0])); - LoadStringW(hInstance, IDS_YES, yes, sizeof(yes) / sizeof(yes[0])); - LoadStringW(hInstance, IDS_NO, no, sizeof(no) / sizeof(no[0])); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA, financialCriteria, ARRAY_SIZE(financialCriteria)); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_AVAILABLE, available, ARRAY_SIZE(available)); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_NOT_AVAILABLE, notAvailable, ARRAY_SIZE(notAvailable)); + LoadStringW(hInstance, IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA, meetsCriteria, ARRAY_SIZE(meetsCriteria)); + LoadStringW(hInstance, IDS_YES, yes, ARRAY_SIZE(yes)); + LoadStringW(hInstance, IDS_NO, no, ARRAY_SIZE(no)); stringsLoaded = TRUE; } if (dwFormatStrType & CRYPT_FORMAT_STR_MULTI_LINE) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 5a447d09ca..61b2cbc88e 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -69,7 +69,7 @@ static const WCHAR ADDRESSBOOK[] = {'A','D','D','R','E','S','S','B','O','O','K', static const WCHAR TRUSTEDPUBLISHER[] = {'T','r','u','s','t','e','d','P','u','b','l','i','s','h','e','r',0}; static const WCHAR DISALLOWED[] = {'D','i','s','a','l','l','o','w','e','d',0}; static const LPCWSTR LocalizedKeys[] = {ROOT,MY,CA,ADDRESSBOOK,TRUSTEDPUBLISHER,DISALLOWED}; -static WCHAR LocalizedNames[sizeof(LocalizedKeys)/sizeof(LocalizedKeys[0])][256]; +static WCHAR LocalizedNames[ARRAY_SIZE(LocalizedKeys)][256]; static void free_function_sets(void) { @@ -1006,7 +1006,7 @@ static void oid_init_localizednames(void) { unsigned int i; - for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) + for(i = 0; i < ARRAY_SIZE(LocalizedKeys); i++) { LoadStringW(hInstance, IDS_LOCALIZEDNAME_ROOT+i, LocalizedNames[i], 256); } @@ -1019,7 +1019,7 @@ LPCWSTR WINAPI CryptFindLocalizedName(LPCWSTR pwszCryptName) { unsigned int i; - for(i = 0; i < sizeof(LocalizedKeys)/sizeof(LPCWSTR); i++) + for(i = 0; i < ARRAY_SIZE(LocalizedKeys); i++) { if(!lstrcmpiW(LocalizedKeys[i], pwszCryptName)) { @@ -1399,8 +1399,7 @@ static void init_oid_info(void) DWORD i; oid_init_localizednames(); - for (i = 0; i < sizeof(oidInfoConstructors) / - sizeof(oidInfoConstructors[0]); i++) + for (i = 0; i < ARRAY_SIZE(oidInfoConstructors); i++) { if (!IS_INTRESOURCE(oidInfoConstructors[i].pwszName)) { diff --git a/dlls/crypt32/regstore.c b/dlls/crypt32/regstore.c index 7678bab6aa..ce32a30f3b 100644 --- a/dlls/crypt32/regstore.c +++ b/dlls/crypt32/regstore.c @@ -71,7 +71,7 @@ static void CRYPT_RegReadSerializedFromReg(HKEY key, DWORD contextType, WCHAR subKeyName[MAX_PATH]; do { - DWORD size = sizeof(subKeyName) / sizeof(WCHAR); + DWORD size = ARRAY_SIZE(subKeyName); rc = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, NULL, NULL); @@ -163,7 +163,7 @@ static void CRYPT_RegReadFromReg(HKEY key, HCERTSTORE store) CERT_STORE_CRL_CONTEXT_FLAG, CERT_STORE_CTL_CONTEXT_FLAG }; DWORD i; - for (i = 0; i < sizeof(subKeys) / sizeof(subKeys[0]); i++) + for (i = 0; i < ARRAY_SIZE(subKeys); i++) { HKEY hKey; LONG rc; @@ -255,7 +255,7 @@ static BOOL CRYPT_RegWriteToReg(WINE_REGSTOREINFO *store) BOOL ret = TRUE; DWORD i; - for (i = 0; ret && i < sizeof(subKeys) / sizeof(subKeys[0]); i++) + for (i = 0; ret && i < ARRAY_SIZE(subKeys); i++) { HKEY key; LONG rc = RegCreateKeyExW(store->key, subKeys[i], 0, NULL, 0, @@ -561,8 +561,7 @@ WINECRYPT_CERTSTORE *CRYPT_RegOpenStore(HCRYPTPROV hCryptProv, DWORD dwFlags, CRYPT_RegReadFromReg(regInfo->key, regInfo->memStore); regInfo->dirty = FALSE; provInfo.cbSize = sizeof(provInfo); - provInfo.cStoreProvFunc = sizeof(regProvFuncs) / - sizeof(regProvFuncs[0]); + provInfo.cStoreProvFunc = ARRAY_SIZE(regProvFuncs); provInfo.rgpvStoreProvFunc = regProvFuncs; provInfo.hStoreProv = regInfo; store = CRYPT_ProvCreateStore(dwFlags, memStore, &provInfo); diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 73d954f740..e7ed4e9bea 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -780,7 +780,7 @@ static void add_ms_root_certs(HCERTSTORE to) TRACE("\n"); - for (i = 0; i < sizeof(msRootCerts) / sizeof(msRootCerts[0]); i++) + for (i = 0; i < ARRAY_SIZE(msRootCerts); i++) if (!CertAddEncodedCertificateToStore(to, X509_ASN_ENCODING, msRootCerts[i].pb, msRootCerts[i].cb, CERT_STORE_ADD_NEW, NULL)) WARN("adding root cert %d failed: %08x\n", i, GetLastError()); @@ -830,9 +830,7 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) } #endif - for (i = 0; !ret && - i < sizeof(CRYPT_knownLocations) / sizeof(CRYPT_knownLocations[0]); - i++) + for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); check_and_store_certs(from, store); } diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c index b0c4692c1f..f51bceb460 100644 --- a/dlls/crypt32/sip.c +++ b/dlls/crypt32/sip.c @@ -28,6 +28,7 @@ #include "winnls.h" #include "mssip.h" #include "winuser.h" +#include "crypt32_private.h" #include "wine/debug.h" #include "wine/list.h" @@ -440,7 +441,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid WCHAR subKeyName[MAX_PATH]; do { - size = sizeof(subKeyName) / sizeof(subKeyName[0]); + size = ARRAY_SIZE(subKeyName); r = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, NULL, NULL); if (r == ERROR_SUCCESS) @@ -478,7 +479,7 @@ BOOL WINAPI CryptSIPRetrieveSubjectGuid WCHAR subKeyName[MAX_PATH]; do { - size = sizeof(subKeyName) / sizeof(subKeyName[0]); + size = ARRAY_SIZE(subKeyName); r = RegEnumKeyExW(key, index++, subKeyName, &size, NULL, NULL, NULL, NULL); if (r == ERROR_SUCCESS) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index bc4ebde5f6..2b8ea1d5d8 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -124,7 +124,7 @@ BOOL WINAPI I_CertUpdateStore(HCERTSTORE store1, HCERTSTORE store2, DWORD unk0, /* Poor-man's resync: empty first store, then add everything from second * store to it. */ - for (i = 0; i < sizeof(interfaces) / sizeof(interfaces[0]); i++) + for (i = 0; i < ARRAY_SIZE(interfaces); i++) { const void *context; @@ -717,8 +717,7 @@ static WINECRYPT_CERTSTORE *CRYPT_MsgOpenStore(HCRYPTPROV hCryptProv, CERT_STORE_PROV_INFO provInfo = { 0 }; provInfo.cbSize = sizeof(provInfo); - provInfo.cStoreProvFunc = sizeof(msgProvFuncs) / - sizeof(msgProvFuncs[0]); + provInfo.cStoreProvFunc = ARRAY_SIZE(msgProvFuncs); provInfo.rgpvStoreProvFunc = msgProvFuncs; provInfo.hStoreProv = CryptMsgDuplicate(msg); store = CRYPT_ProvCreateStore(dwFlags, memStore, &provInfo); @@ -1338,7 +1337,7 @@ BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, ret = TRUE; do { WCHAR name[MAX_PATH]; - DWORD size = sizeof(name) / sizeof(name[0]); + DWORD size = ARRAY_SIZE(name); rc = RegEnumKeyExW(key, index++, name, &size, NULL, NULL, NULL, NULL); diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 1daf29f8a0..4843c4f5f1 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -26,6 +26,7 @@ #include "wincrypt.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "crypt32_private.h" WINE_DEFAULT_DEBUG_CHANNEL(crypt); @@ -775,7 +776,7 @@ struct KeynameKeeper static void CRYPT_InitializeKeynameKeeper(struct KeynameKeeper *keeper) { keeper->keyName = keeper->buf; - keeper->keyLen = sizeof(keeper->buf) / sizeof(keeper->buf[0]); + keeper->keyLen = ARRAY_SIZE(keeper->buf); } static void CRYPT_FreeKeynameKeeper(struct KeynameKeeper *keeper) @@ -1326,8 +1327,7 @@ DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT pCertContext, DWORD dwType, { PCERT_RDN_ATTR nameAttr = NULL; - for (i = 0; !nameAttr && i < sizeof(simpleAttributeOIDs) / - sizeof(simpleAttributeOIDs[0]); i++) + for (i = 0; !nameAttr && i < ARRAY_SIZE(simpleAttributeOIDs); i++) nameAttr = CertFindRDNAttr(simpleAttributeOIDs[i], nameInfo); if (nameAttr) ret = CertRDNValueToStrW(nameAttr->dwValueType, -- 2.17.1

2 4

[PATCH] comctl32/imagelist: fix ImageList_Read/Write.
by Denis Malikov 20 Jun '18

20 Jun '18

From: Denis Malikov <mdn40000(a)mail.ru> Date: Sat, 16 Jun 2018 16:35:45 +0700 Subject: [PATCH] comctl32/imagelist: fix ImageList_Read/Write. Fix for versions x600 and x620 and pointer calculation for mixing image and mask bits. Tested on ReactOS 0.4.10 with *.reg files extracted from: - XP/2003 key HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\TrayNotify; - Vista/7 key HKEY_CLASSES_ROOT\Local Settings\Software\Microsoft\Windows\CurrentVersion\TrayNotify Signed-off-by: Denis Malikov <mdn40000(a)mail.ru> --- dlls/comctl32/imagelist.c | 59 +++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a08d60752e..052d59f9e4 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -59,7 +59,7 @@ struct _IMAGELIST INT cGrow; /* 0C: cGrow */ INT cx; /* 10: cx */ INT cy; /* 14: cy */ - DWORD x4; + DWORD x4; /* hack for IL from stream. Keep version here */ UINT flags; /* 1C: flags */ COLORREF clrFg; /* 20: foreground color */ COLORREF clrBk; /* 24: background color */ @@ -83,6 +83,7 @@ struct _IMAGELIST }; #define IMAGELIST_MAGIC 0x53414D58 +#define IMAGELIST_VERSION 0x101 /* Header used by ImageList_Read() and ImageList_Write() */ #include "pshpack2.h" @@ -806,6 +807,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->clrFg = CLR_DEFAULT; himl->clrBk = CLR_NONE; himl->color_table_set = FALSE; + himl->x4 = 0; /* initialize overlay mask indices */ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) @@ -2257,38 +2259,43 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) BITMAPINFO *image_info = (BITMAPINFO *)image_buf; BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf; void *image_bits, *mask_bits = NULL; - ILHEAD ilHead; - HIMAGELIST himl; + ILHEAD ilHead; + HIMAGELIST himl; unsigned int i; TRACE("%p\n", pstm); if (FAILED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL))) - return NULL; + return NULL; if (ilHead.usMagic != (('L' << 8) | 'I')) - return NULL; - if (ilHead.usVersion != 0x101) /* probably version? */ - return NULL; + return NULL; + if (ilHead.usVersion != IMAGELIST_VERSION && + ilHead.usVersion != 0x600 && /* XP/2003 version */ + ilHead.usVersion != 0x620) /* Vista/7 version */ + return NULL; TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if (!himl) - return NULL; + return NULL; + + // keep version from stream + himl->x4 = ilHead.usVersion; if (!(image_bits = read_bitmap(pstm, image_info))) { - WARN("failed to read bitmap from stream\n"); - return NULL; + WARN("failed to read bitmap from stream\n"); + return NULL; } if (ilHead.flags & ILC_MASK) { if (!(mask_bits = read_bitmap(pstm, mask_info))) { WARN("failed to read mask bitmap from stream\n"); - return NULL; - } + return NULL; + } } else mask_info = NULL; @@ -2296,23 +2303,25 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) { DWORD *ptr = image_bits; BYTE *mask_ptr = mask_bits; - int stride = himl->cy * image_info->bmiHeader.biWidth; + int stride = himl->cy * (ilHead.usVersion != IMAGELIST_VERSION ? himl->cx : image_info->bmiHeader.biWidth); + int image_step = ilHead.usVersion != IMAGELIST_VERSION ? 1 : TILE_COUNT; + int mask_step = ilHead.usVersion != IMAGELIST_VERSION ? 4 : 8; if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ { ptr += image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride; - mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 8; + mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / mask_step; stride = -stride; image_info->bmiHeader.biHeight = himl->cy; } else image_info->bmiHeader.biHeight = -himl->cy; - for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT) + for (i = 0; i < ilHead.cCurImage; i += image_step) { - add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ), + add_dib_bits( himl, i, min( ilHead.cCurImage - i, image_step ), himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr ); ptr += stride; - mask_ptr += stride / 8; + mask_ptr += stride / mask_step; } } else @@ -2333,7 +2342,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) ImageList_SetBkColor(himl,ilHead.bkcolor); for (i=0;i<4;i++) - ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1); + ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1); return himl; } @@ -3078,10 +3087,10 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) TRACE("%p %p\n", himl, pstm); if (!is_valid(himl)) - return FALSE; + return FALSE; ilHead.usMagic = (('L' << 8) | 'I'); - ilHead.usVersion = 0x101; + ilHead.usVersion = himl->x4 > 0 ? himl->x4 : IMAGELIST_VERSION; ilHead.cCurImage = himl->cCurImage; ilHead.cMaxImage = himl->cMaxImage; ilHead.cGrow = himl->cGrow; @@ -3090,23 +3099,23 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) ilHead.bkcolor = himl->clrBk; ilHead.flags = himl->flags; for(i = 0; i < 4; i++) { - ilHead.ovls[i] = himl->nOvlIdx[i]; + ilHead.ovls[i] = himl->nOvlIdx[i]; } TRACE("cx %u, cy %u, flags 0x04%x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if(FAILED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL))) - return FALSE; + return FALSE; /* write the bitmap */ if(!_write_bitmap(himl->hbmImage, pstm)) - return FALSE; + return FALSE; /* write the mask if we have one */ if(himl->flags & ILC_MASK) { - if(!_write_bitmap(himl->hbmMask, pstm)) - return FALSE; + if(!_write_bitmap(himl->hbmMask, pstm)) + return FALSE; } return TRUE; -- 2.16.2.windows.1

2 1

Re: [PATCH] comctl32/imagelist: fix ImageList_Read/Write.
by Zhiyi Zhang 20 Jun '18

20 Jun '18

Hi Denis, Thanks for taking the time. I noticed a few issues with your patch. 1. Using C++ style comments. 2. Mixing style only changes, please separate them if you really need to make style changes. Usually, I prefer not to touch the old code simply for style changes. 3. Add a conformance test for the problem you intent to fix. 4. Add a version to patch mail subject. You might want to read https://wiki.winehq.org/Submitting_Patches Regards, Zhiyi

1 0

[PATCH] comctl32/imagelist: fix ImageList_Read/Write.
by Denis Malikov 20 Jun '18

20 Jun '18

From: Denis Malikov <mdn40000(a)mail.ru> Date: Sat, 16 Jun 2018 16:35:45 +0700 Subject: [PATCH] comctl32/imagelist: fix ImageList_Read/Write. Fix pointer calculation for mixing image and mask bits for versions x600 and x620. Tested with *.reg files extracted from: XP/2003 key HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\TrayNotify; Vista/7 key HKEY_CLASSES_ROOT\Local Settings\Software\Microsoft\Windows\CurrentVersion\TrayNotify Signed-off-by: Denis Malikov <mdn40000(a)mail.ru> --- dlls/comctl32/imagelist.c | 59 +++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index a08d60752e..052d59f9e4 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -59,7 +59,7 @@ struct _IMAGELIST INT cGrow; /* 0C: cGrow */ INT cx; /* 10: cx */ INT cy; /* 14: cy */ - DWORD x4; + DWORD x4; /* hack for IL from stream. Keep version here */ UINT flags; /* 1C: flags */ COLORREF clrFg; /* 20: foreground color */ COLORREF clrBk; /* 24: background color */ @@ -83,6 +83,7 @@ struct _IMAGELIST }; #define IMAGELIST_MAGIC 0x53414D58 +#define IMAGELIST_VERSION 0x101 /* Header used by ImageList_Read() and ImageList_Write() */ #include "pshpack2.h" @@ -806,6 +807,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->clrFg = CLR_DEFAULT; himl->clrBk = CLR_NONE; himl->color_table_set = FALSE; + himl->x4 = 0; /* initialize overlay mask indices */ for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) @@ -2257,38 +2259,43 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) BITMAPINFO *image_info = (BITMAPINFO *)image_buf; BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf; void *image_bits, *mask_bits = NULL; - ILHEAD ilHead; - HIMAGELIST himl; + ILHEAD ilHead; + HIMAGELIST himl; unsigned int i; TRACE("%p\n", pstm); if (FAILED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL))) - return NULL; + return NULL; if (ilHead.usMagic != (('L' << 8) | 'I')) - return NULL; - if (ilHead.usVersion != 0x101) /* probably version? */ - return NULL; + return NULL; + if (ilHead.usVersion != IMAGELIST_VERSION && + ilHead.usVersion != 0x600 && /* XP/2003 version */ + ilHead.usVersion != 0x620) /* Vista/7 version */ + return NULL; TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if (!himl) - return NULL; + return NULL; + + // keep version from stream + himl->x4 = ilHead.usVersion; if (!(image_bits = read_bitmap(pstm, image_info))) { - WARN("failed to read bitmap from stream\n"); - return NULL; + WARN("failed to read bitmap from stream\n"); + return NULL; } if (ilHead.flags & ILC_MASK) { if (!(mask_bits = read_bitmap(pstm, mask_info))) { WARN("failed to read mask bitmap from stream\n"); - return NULL; - } + return NULL; + } } else mask_info = NULL; @@ -2296,23 +2303,25 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) { DWORD *ptr = image_bits; BYTE *mask_ptr = mask_bits; - int stride = himl->cy * image_info->bmiHeader.biWidth; + int stride = himl->cy * (ilHead.usVersion != IMAGELIST_VERSION ? himl->cx : image_info->bmiHeader.biWidth); + int image_step = ilHead.usVersion != IMAGELIST_VERSION ? 1 : TILE_COUNT; + int mask_step = ilHead.usVersion != IMAGELIST_VERSION ? 4 : 8; if (image_info->bmiHeader.biHeight > 0) /* bottom-up */ { ptr += image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride; - mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 8; + mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / mask_step; stride = -stride; image_info->bmiHeader.biHeight = himl->cy; } else image_info->bmiHeader.biHeight = -himl->cy; - for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT) + for (i = 0; i < ilHead.cCurImage; i += image_step) { - add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ), + add_dib_bits( himl, i, min( ilHead.cCurImage - i, image_step ), himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr ); ptr += stride; - mask_ptr += stride / 8; + mask_ptr += stride / mask_step; } } else @@ -2333,7 +2342,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) ImageList_SetBkColor(himl,ilHead.bkcolor); for (i=0;i<4;i++) - ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1); + ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1); return himl; } @@ -3078,10 +3087,10 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) TRACE("%p %p\n", himl, pstm); if (!is_valid(himl)) - return FALSE; + return FALSE; ilHead.usMagic = (('L' << 8) | 'I'); - ilHead.usVersion = 0x101; + ilHead.usVersion = himl->x4 > 0 ? himl->x4 : IMAGELIST_VERSION; ilHead.cCurImage = himl->cCurImage; ilHead.cMaxImage = himl->cMaxImage; ilHead.cGrow = himl->cGrow; @@ -3090,23 +3099,23 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm) ilHead.bkcolor = himl->clrBk; ilHead.flags = himl->flags; for(i = 0; i < 4; i++) { - ilHead.ovls[i] = himl->nOvlIdx[i]; + ilHead.ovls[i] = himl->nOvlIdx[i]; } TRACE("cx %u, cy %u, flags 0x04%x, cCurImage %u, cMaxImage %u\n", ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); if(FAILED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL))) - return FALSE; + return FALSE; /* write the bitmap */ if(!_write_bitmap(himl->hbmImage, pstm)) - return FALSE; + return FALSE; /* write the mask if we have one */ if(himl->flags & ILC_MASK) { - if(!_write_bitmap(himl->hbmMask, pstm)) - return FALSE; + if(!_write_bitmap(himl->hbmMask, pstm)) + return FALSE; } return TRUE; -- 2.16.2.windows.1

1 0

[PATCH] wsdapi: Add a trailing '\n' to a WARN() message.
by Francois Gouget 20 Jun '18

20 Jun '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/network.c b/dlls/wsdapi/network.c index e124a5d90cf..c8f260c7653 100644 --- a/dlls/wsdapi/network.c +++ b/dlls/wsdapi/network.c @@ -540,7 +540,7 @@ static BOOL start_listening_on_all_addresses(IWSDiscoveryPublisherImpl *impl, UL { if (impl->num_thread_handles >= MAX_WSD_THREADS) { - WARN("Exceeded maximum number of supported listener threads; too many network interfaces."); + WARN("Exceeded maximum number of supported listener threads; too many network interfaces.\n"); goto cleanup; } -- 2.17.1

1 0