June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : d2d1: Use D3DDeviceContextState instead of D3D10 state block.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 8c9354926204242cde714a51e5283bc3aac55837 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c9354926204242cde714a51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:36 2021 +0200 d2d1: Use D3DDeviceContextState instead of D3D10 state block. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 23 ++++---- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 146 ++++++++++++----------------------------------- 3 files changed, 48 insertions(+), 123 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8c9354926204242cde71…

1 0

Jacek Caban : conhost: Silence FIXME in console_input_ioctl.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 8dfcc1e3bc97e67fa4a329299e29feb8e5d1b8e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dfcc1e3bc97e67fa4a32929… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 28 17:32:38 2021 +0200 conhost: Silence FIXME in console_input_ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 86dadad9277..7db1261d3be 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2565,8 +2565,8 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, return STATUS_SUCCESS; default: - FIXME( "unsupported ioctl %x\n", code ); - return STATUS_NOT_SUPPORTED; + WARN( "unsupported ioctl %x\n", code ); + return STATUS_INVALID_HANDLE; } }

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create blend state.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 50e04d9f9d18fd29e747c4dc4874c23b0e5404b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50e04d9f9d18fd29e747c4dc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:34 2021 +0200 d2d1: Use D3D11 interfaces to create blend state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 39 ++++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 0915bc55cfd..f823953dd2b 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -173,7 +173,7 @@ struct d2d_device_context unsigned int vb_stride; ID3D11Buffer *vb; ID3D11RasterizerState *rs; - ID3D10BlendState *bs; + ID3D11BlendState *bs; ID3D10SamplerState *sampler_states [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] [D2D_SAMPLER_EXTEND_MODE_COUNT] diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 0a0e9f5bbe6..ba9e4e13481 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -129,6 +129,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10VertexShader *d3d10_vs = NULL; ID3D10PixelShader *d3d10_ps = NULL; ID3D10InputLayout *d3d10_il = NULL; + ID3D10BlendState *d3d10_bs = NULL; D3D10_RECT scissor_rect; unsigned int offset; D3D10_VIEWPORT vp; @@ -189,6 +190,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (render_target->bs && FAILED(hr = ID3D11BlendState_QueryInterface(render_target->bs, &IID_ID3D10BlendState, (void **)&d3d10_bs))) + { + ERR("Failed to query D3D10 blend state, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -229,7 +236,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { - ID3D10Device_OMSetBlendState(device, render_target->bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); + ID3D10Device_OMSetBlendState(device, d3d10_bs, NULL, D3D10_DEFAULT_SAMPLE_MASK); d2d_brush_bind_resources(brush, render_target, 0); } if (opacity_brush) @@ -244,6 +251,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_bs) ID3D10BlendState_Release(d3d10_bs); if (d3d10_rs) ID3D10RasterizerState_Release(d3d10_rs); if (d3d10_ps) ID3D10PixelShader_Release(d3d10_ps); if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); @@ -325,7 +333,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) if (context->text_rendering_params) IDWriteRenderingParams_Release(context->text_rendering_params); if (context->bs) - ID3D10BlendState_Release(context->bs); + ID3D11BlendState_Release(context->bs); ID3D11RasterizerState_Release(context->rs); ID3D11Buffer_Release(context->vb); ID3D11Buffer_Release(context->ib); @@ -2076,7 +2084,7 @@ static void d2d_device_context_reset_target(struct d2d_device_context *context) memset(&context->desc.pixelFormat, 0, sizeof(context->desc.pixelFormat)); memset(&context->pixel_size, 0, sizeof(context->pixel_size)); - ID3D10BlendState_Release(context->bs); + ID3D11BlendState_Release(context->bs); context->bs = NULL; } @@ -2084,7 +2092,7 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i { struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_bitmap *bitmap_impl; - D3D10_BLEND_DESC blend_desc; + D3D11_BLEND_DESC blend_desc; ID2D1Bitmap *bitmap; HRESULT hr; @@ -2118,23 +2126,24 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i context->target = bitmap_impl; memset(&blend_desc, 0, sizeof(blend_desc)); - blend_desc.BlendEnable[0] = TRUE; - blend_desc.SrcBlend = D3D10_BLEND_ONE; - blend_desc.DestBlend = D3D10_BLEND_INV_SRC_ALPHA; - blend_desc.BlendOp = D3D10_BLEND_OP_ADD; + blend_desc.IndependentBlendEnable = FALSE; + blend_desc.RenderTarget[0].BlendEnable = TRUE; + blend_desc.RenderTarget[0].SrcBlend = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlend = D3D11_BLEND_INV_SRC_ALPHA; + blend_desc.RenderTarget[0].BlendOp = D3D11_BLEND_OP_ADD; if (context->desc.pixelFormat.alphaMode == D2D1_ALPHA_MODE_IGNORE) { - blend_desc.SrcBlendAlpha = D3D10_BLEND_ZERO; - blend_desc.DestBlendAlpha = D3D10_BLEND_ONE; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ZERO; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_ONE; } else { - blend_desc.SrcBlendAlpha = D3D10_BLEND_ONE; - blend_desc.DestBlendAlpha = D3D10_BLEND_INV_SRC_ALPHA; + blend_desc.RenderTarget[0].SrcBlendAlpha = D3D11_BLEND_ONE; + blend_desc.RenderTarget[0].DestBlendAlpha = D3D11_BLEND_INV_SRC_ALPHA; } - blend_desc.BlendOpAlpha = D3D10_BLEND_OP_ADD; - blend_desc.RenderTargetWriteMask[0] = D3D10_COLOR_WRITE_ENABLE_ALL; - if (FAILED(hr = ID3D10Device_CreateBlendState(context->d3d_device, &blend_desc, &context->bs))) + blend_desc.RenderTarget[0].BlendOpAlpha = D3D11_BLEND_OP_ADD; + blend_desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + if (FAILED(hr = ID3D11Device1_CreateBlendState(context->d3d11_device, &blend_desc, &context->bs))) WARN("Failed to create blend state, hr %#x.\n", hr); }

1 0

Zhiyi Zhang : light.msstyles: Add TrackBar parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 3e4c5afeb23c724d9efa3d8a746be02312eb5f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4c5afeb23c724d9efa3d8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:20 2021 +0800 light.msstyles: Add TrackBar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 15 +++ dlls/light.msstyles/blue_trackbar_slider_track.bmp | Bin 0 -> 378 bytes dlls/light.msstyles/blue_trackbar_slider_track.svg | 13 ++ .../blue_trackbar_thumb_down_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 21 +++ .../blue_trackbar_thumb_down_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_down_15px.svg | 21 +++ .../blue_trackbar_thumb_down_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_down_21px.svg | 21 +++ .../blue_trackbar_thumb_horizontal.bmp | Bin 0 -> 2418 bytes .../blue_trackbar_thumb_horizontal.svg | 19 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 21 +++ .../blue_trackbar_thumb_left_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_left_25px.svg | 21 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_left_44px.svg | 21 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 21 +++ .../blue_trackbar_thumb_right_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 21 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_right_44px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_11px.bmp | Bin 0 -> 4318 bytes .../light.msstyles/blue_trackbar_thumb_up_11px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_15px.bmp | Bin 0 -> 7638 bytes .../light.msstyles/blue_trackbar_thumb_up_15px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_21px.bmp | Bin 0 -> 18618 bytes .../light.msstyles/blue_trackbar_thumb_up_21px.svg | 21 +++ .../blue_trackbar_thumb_vertical.bmp | Bin 0 -> 4758 bytes .../blue_trackbar_thumb_vertical.svg | 19 +++ dlls/light.msstyles/light.rc | 150 +++++++++++++++++++++ 32 files changed, 468 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4c5afeb23c724d9efa…

1 0

Rémi Bernon : hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 28bbaf670749fe058a6770982a4d0a3100032fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bbaf670749fe058a677098… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:57 2021 +0200 hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 5 +++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59f18276b38..6261c3c2f68 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -96,13 +96,14 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; + BOOL incompatible = FALSE; LONG remaining = *count; for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (filter->report_id && caps->report_id != filter->report_id) continue; + if (filter->report_id && caps->report_id != filter->report_id) incompatible = TRUE; else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -111,7 +112,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; - if (*count == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (*count == 0) return incompatible ? HIDP_STATUS_INCOMPATIBLE_REPORT_ID : HIDP_STATUS_USAGE_NOT_FOUND; if (remaining < 0) return HIDP_STATUS_BUFFER_TOO_SMALL; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 432bc168259..753957a8ac6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2292,14 +2292,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, @@ -2330,13 +2328,11 @@ static void test_hidp(HANDLE file, int report_id) report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value,

1 0

Zebediah Figura : qcap/vfwcapture: Set the correct allocator properties when connecting.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: a216c0a28b7ded2d35d6692767468510f2a2e468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a216c0a28b7ded2d35d66927… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 28 00:08:56 2021 -0500 qcap/vfwcapture: Set the correct allocator properties when connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/vfwcapture.c | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index ae073b845e0..6f03a3124af 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -190,17 +190,8 @@ static DWORD WINAPI stream_thread(void *arg) static HRESULT vfw_capture_init_stream(struct strmbase_filter *iface) { struct vfw_capture *filter = impl_from_strmbase_filter(iface); - ALLOCATOR_PROPERTIES req_props, ret_props; HRESULT hr; - req_props.cBuffers = 3; - req_props.cbBuffer = get_image_size(filter); - req_props.cbAlign = 1; - req_props.cbPrefix = 0; - if (FAILED(hr = IMemAllocator_SetProperties(filter->source.pAllocator, &req_props, &ret_props)) - && hr != VFW_E_ALREADY_COMMITTED) - ERR("Failed to set allocator properties (buffer size %u), hr %#x.\n", req_props.cbBuffer, hr); - if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) ERR("Failed to commit allocator, hr %#x.\n", hr); @@ -688,20 +679,19 @@ static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, vo } static HRESULT WINAPI VfwPin_DecideBufferSize(struct strmbase_source *iface, - IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) + IMemAllocator *allocator, ALLOCATOR_PROPERTIES *req_props) { - ALLOCATOR_PROPERTIES actual; + struct vfw_capture *filter = impl_from_strmbase_pin(&iface->pin); + ALLOCATOR_PROPERTIES ret_props; - /* What we put here doesn't matter, the - driver function should override it then commit */ - if (!ppropInputRequest->cBuffers) - ppropInputRequest->cBuffers = 3; - if (!ppropInputRequest->cbBuffer) - ppropInputRequest->cbBuffer = 230400; - if (!ppropInputRequest->cbAlign) - ppropInputRequest->cbAlign = 1; + if (!req_props->cBuffers) + req_props->cBuffers = 3; + if (!req_props->cbBuffer) + req_props->cbBuffer = get_image_size(filter); + if (!req_props->cbAlign) + req_props->cbAlign = 1; - return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); + return IMemAllocator_SetProperties(allocator, req_props, &ret_props); } static const struct strmbase_source_ops source_ops =

1 0

Zebediah Figura : wined3d: Move box validation to wined3d_device_context_map().
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 08c96a488892b2ea3bf339691a85d54ba113f129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08c96a488892b2ea3bf33969… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 18:21:26 2021 -0500 wined3d: Move box validation to wined3d_device_context_map(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++++++++++ dlls/wined3d/texture.c | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5b2bd7ae03b..96657141419 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4866,6 +4866,16 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, wined3d_box_set(&b, 0, 0, desc.width, desc.height, 0, desc.depth); box = &b; } + else if (FAILED(wined3d_resource_check_box_dimensions(resource, sub_resource_idx, box))) + { + WARN("Map box is invalid.\n"); + + if (resource->type != WINED3D_RTYPE_BUFFER && resource->type != WINED3D_RTYPE_TEXTURE_2D) + return WINED3DERR_INVALIDCALL; + + if ((resource->format_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) + return WINED3DERR_INVALIDCALL; + } if (SUCCEEDED(hr = context->ops->map(context, resource, sub_resource_idx, &map_desc->data, box, flags))) wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0f753e66704..62f38a1d592 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3513,13 +3513,6 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); texture_level = sub_resource_idx % texture->level_count; - if (FAILED(wined3d_resource_check_box_dimensions(resource, sub_resource_idx, box))) - { - WARN("Map box is invalid.\n"); - if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) - || resource->type != WINED3D_RTYPE_TEXTURE_2D) - return WINED3DERR_INVALIDCALL; - } if (texture->flags & WINED3D_TEXTURE_DC_IN_USE) {

1 0

Rémi Bernon : d2d1: Use D3D11 interfaces to create rasterizer state.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 942ee9318ea5cadfebf4da6db7f24553f11174db URL: https://source.winehq.org/git/wine.git/?a=commit;h=942ee9318ea5cadfebf4da6d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:17:33 2021 +0200 d2d1: Use D3D11 interfaces to create rasterizer state. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49395 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/device.c | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 73259835786..0915bc55cfd 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -172,7 +172,7 @@ struct d2d_device_context ID3D11Buffer *ib; unsigned int vb_stride; ID3D11Buffer *vb; - ID3D10RasterizerState *rs; + ID3D11RasterizerState *rs; ID3D10BlendState *bs; ID3D10SamplerState *sampler_states [D2D_SAMPLER_INTERPOLATION_MODE_COUNT] diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index efeeaf6aa18..0a0e9f5bbe6 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -125,6 +125,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en ID3D10Device *device = render_target->d3d_device; ID3D10Buffer *d3d10_ib = NULL, *d3d10_vb = NULL, *d3d10_vs_cb = NULL, *d3d10_ps_cb = NULL; ID3D11Buffer *vs_cb = render_target->vs_cb, *ps_cb = render_target->ps_cb; + ID3D10RasterizerState *d3d10_rs = NULL; ID3D10VertexShader *d3d10_vs = NULL; ID3D10PixelShader *d3d10_ps = NULL; ID3D10InputLayout *d3d10_il = NULL; @@ -182,6 +183,12 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en goto error; } + if (render_target->rs && FAILED(hr = ID3D11RasterizerState_QueryInterface(render_target->rs, &IID_ID3D10RasterizerState, (void **)&d3d10_rs))) + { + ERR("Failed to query D3D10 rasterizer state, hr %#x.\n", hr); + goto error; + } + if (FAILED(hr = render_target->stateblock->lpVtbl->Capture(render_target->stateblock))) { WARN("Failed to capture stateblock, hr %#x.\n", hr); @@ -218,7 +225,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en scissor_rect.bottom = render_target->pixel_size.height; } ID3D10Device_RSSetScissorRects(device, 1, &scissor_rect); - ID3D10Device_RSSetState(device, render_target->rs); + ID3D10Device_RSSetState(device, d3d10_rs); ID3D10Device_OMSetRenderTargets(device, 1, &render_target->target->rtv, NULL); if (brush) { @@ -237,6 +244,7 @@ static void d2d_device_context_draw(struct d2d_device_context *render_target, en WARN("Failed to apply stateblock, hr %#x.\n", hr); error: + if (d3d10_rs) ID3D10RasterizerState_Release(d3d10_rs); if (d3d10_ps) ID3D10PixelShader_Release(d3d10_ps); if (d3d10_vs) ID3D10VertexShader_Release(d3d10_vs); if (d3d10_il) ID3D10InputLayout_Release(d3d10_il); @@ -318,7 +326,7 @@ static ULONG STDMETHODCALLTYPE d2d_device_context_inner_Release(IUnknown *iface) IDWriteRenderingParams_Release(context->text_rendering_params); if (context->bs) ID3D10BlendState_Release(context->bs); - ID3D10RasterizerState_Release(context->rs); + ID3D11RasterizerState_Release(context->rs); ID3D11Buffer_Release(context->vb); ID3D11Buffer_Release(context->ib); ID3D11Buffer_Release(context->ps_cb); @@ -2859,7 +2867,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, D3D10_STATE_BLOCK_MASK state_mask; struct d2d_device *device_impl; IDWriteFactory *dwrite_factory; - D3D10_RASTERIZER_DESC rs_desc; + D3D11_RASTERIZER_DESC rs_desc; D3D11_BUFFER_DESC buffer_desc; unsigned int i; HRESULT hr; @@ -4033,8 +4041,8 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, goto err; } - rs_desc.FillMode = D3D10_FILL_SOLID; - rs_desc.CullMode = D3D10_CULL_NONE; + rs_desc.FillMode = D3D11_FILL_SOLID; + rs_desc.CullMode = D3D11_CULL_NONE; rs_desc.FrontCounterClockwise = FALSE; rs_desc.DepthBias = 0; rs_desc.DepthBiasClamp = 0.0f; @@ -4043,7 +4051,7 @@ static HRESULT d2d_device_context_init(struct d2d_device_context *render_target, rs_desc.ScissorEnable = TRUE; rs_desc.MultisampleEnable = FALSE; rs_desc.AntialiasedLineEnable = FALSE; - if (FAILED(hr = ID3D10Device_CreateRasterizerState(render_target->d3d_device, &rs_desc, &render_target->rs))) + if (FAILED(hr = ID3D11Device1_CreateRasterizerState(render_target->d3d11_device, &rs_desc, &render_target->rs))) { WARN("Failed to create clear rasterizer state, hr %#x.\n", hr); goto err; @@ -4082,7 +4090,7 @@ err: if (render_target->default_text_rendering_params) IDWriteRenderingParams_Release(render_target->default_text_rendering_params); if (render_target->rs) - ID3D10RasterizerState_Release(render_target->rs); + ID3D11RasterizerState_Release(render_target->rs); if (render_target->vb) ID3D11Buffer_Release(render_target->vb); if (render_target->ib)

1 0

Zebediah Figura : wined3d: Pass a wined3d_resource and sub-resource index to wined3d_texture_check_box_dimensions().
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 2e0667757016a6ac4b24a3183c261fc1020b60e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0667757016a6ac4b24a318… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 25 18:21:25 2021 -0500 wined3d: Pass a wined3d_resource and sub-resource index to wined3d_texture_check_box_dimensions(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 9 +++----- dlls/wined3d/resource.c | 38 ++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 50 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 47 insertions(+), 54 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2af705b10e3..5b2bd7ae03b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4608,7 +4608,7 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev wined3d_box_set(&b, 0, 0, min(src_w, dst_w), min(src_h, dst_h), 0, min(src_d, dst_d)); src_box = &b; } - else if (FAILED(wined3d_texture_check_box_dimensions(src_texture, src_level, src_box))) + else if (FAILED(wined3d_resource_check_box_dimensions(src_resource, src_sub_resource_idx, src_box))) { WARN("Invalid source box %s.\n", debug_box(src_box)); return WINED3DERR_INVALIDCALL; @@ -4631,8 +4631,7 @@ HRESULT CDECL wined3d_device_context_copy_sub_resource_region(struct wined3d_dev dst_y + (src_row_count * dst_resource->format->block_height), dst_z, dst_z + (src_box->back - src_box->front)); } - if (FAILED(wined3d_texture_check_box_dimensions(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, &dst_box))) + if (FAILED(wined3d_resource_check_box_dimensions(dst_resource, dst_sub_resource_idx, &dst_box))) { WARN("Invalid destination box %s.\n", debug_box(&dst_box)); return WINED3DERR_INVALIDCALL; @@ -4760,11 +4759,9 @@ HRESULT CDECL wined3d_device_context_clear_rendertarget_view(struct wined3d_devi else { struct wined3d_box b = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; - struct wined3d_texture *texture = texture_from_resource(view->resource); HRESULT hr; - if (FAILED(hr = wined3d_texture_check_box_dimensions(texture, - view->sub_resource_idx % texture->level_count, &b))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(resource, view->sub_resource_idx, &b))) return hr; } diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 58e3e5c77fd..f37c313e023 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -501,6 +501,44 @@ unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *re return resource->multisample_type; } +HRESULT wined3d_resource_check_box_dimensions(struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box) +{ + const struct wined3d_format *format = resource->format; + struct wined3d_sub_resource_desc desc; + unsigned int width_mask, height_mask; + + wined3d_resource_get_sub_resource_desc(resource, sub_resource_idx, &desc); + + if (box->left >= box->right || box->right > desc.width + || box->top >= box->bottom || box->bottom > desc.height + || box->front >= box->back || box->back > desc.depth) + { + WARN("Box %s is invalid.\n", debug_box(box)); + return WINEDDERR_INVALIDRECT; + } + + if (resource->format_flags & WINED3DFMT_FLAG_BLOCKS) + { + /* This assumes power of two block sizes, but NPOT block sizes would + * be silly anyway. + * + * This also assumes that the format's block depth is 1. */ + width_mask = format->block_width - 1; + height_mask = format->block_height - 1; + + if ((box->left & width_mask) || (box->top & height_mask) + || (box->right & width_mask && box->right != desc.width) + || (box->bottom & height_mask && box->bottom != desc.height)) + { + WARN("Box %s is misaligned for %ux%u blocks.\n", debug_box(box), format->block_width, format->block_height); + return WINED3DERR_INVALIDCALL; + } + } + + return WINED3D_OK; +} + VkAccessFlags vk_access_mask_from_bind_flags(uint32_t bind_flags) { VkAccessFlags flags = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5876f580e0d..0f753e66704 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1653,46 +1653,6 @@ void * CDECL wined3d_texture_get_parent(const struct wined3d_texture *texture) return texture->resource.parent; } -HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, - unsigned int level, const struct wined3d_box *box) -{ - const struct wined3d_format *format = texture->resource.format; - unsigned int width_mask, height_mask, width, height, depth; - - width = wined3d_texture_get_level_width(texture, level); - height = wined3d_texture_get_level_height(texture, level); - depth = wined3d_texture_get_level_depth(texture, level); - - if (box->left >= box->right || box->right > width - || box->top >= box->bottom || box->bottom > height - || box->front >= box->back || box->back > depth) - { - WARN("Box %s is invalid.\n", debug_box(box)); - return WINEDDERR_INVALIDRECT; - } - - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - { - /* This assumes power of two block sizes, but NPOT block sizes would - * be silly anyway. - * - * This also assumes that the format's block depth is 1. */ - width_mask = format->block_width - 1; - height_mask = format->block_height - 1; - - if ((box->left & width_mask) || (box->top & height_mask) - || (box->right & width_mask && box->right != width) - || (box->bottom & height_mask && box->bottom != height)) - { - WARN("Box %s is misaligned for %ux%u blocks.\n", - debug_box(box), format->block_width, format->block_height); - return WINED3DERR_INVALIDCALL; - } - } - - return WINED3D_OK; -} - void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) { @@ -2250,7 +2210,7 @@ HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, return WINED3DERR_INVALIDCALL; } - if (dirty_region && FAILED(wined3d_texture_check_box_dimensions(texture, 0, dirty_region))) + if (dirty_region && FAILED(wined3d_resource_check_box_dimensions(&texture->resource, 0, dirty_region))) { WARN("Invalid dirty_region %s specified.\n", debug_box(dirty_region)); return WINED3DERR_INVALIDCALL; @@ -3553,7 +3513,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour sub_resource = wined3d_texture_get_sub_resource(texture, sub_resource_idx); texture_level = sub_resource_idx % texture->level_count; - if (FAILED(wined3d_texture_check_box_dimensions(texture, texture_level, box))) + if (FAILED(wined3d_resource_check_box_dimensions(resource, sub_resource_idx, box))) { WARN("Map box is invalid.\n"); if (((fmt_flags & WINED3DFMT_FLAG_BLOCKS) && !(resource->access & WINED3D_RESOURCE_ACCESS_CPU)) @@ -4024,12 +3984,10 @@ HRESULT CDECL wined3d_device_context_blt(struct wined3d_device_context *context, && filter != WINED3D_TEXF_LINEAR) return WINED3DERR_INVALIDCALL; - if (FAILED(hr = wined3d_texture_check_box_dimensions(dst_texture, - dst_sub_resource_idx % dst_texture->level_count, &dst_box))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(&dst_texture->resource, dst_sub_resource_idx, &dst_box))) return hr; - if (FAILED(hr = wined3d_texture_check_box_dimensions(src_texture, - src_sub_resource_idx % src_texture->level_count, &src_box))) + if (FAILED(hr = wined3d_resource_check_box_dimensions(&src_texture->resource, src_sub_resource_idx, &src_box))) return hr; if (dst_texture->sub_resources[dst_sub_resource_idx].map_count diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 84dad38f0c9..6700302b481 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4134,6 +4134,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * unsigned int size, void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) DECLSPEC_HIDDEN; void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +HRESULT wined3d_resource_check_box_dimensions(struct wined3d_resource *resource, + unsigned int sub_resource_idx, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4358,8 +4360,6 @@ void texture2d_load_fb_texture(struct wined3d_texture_gl *texture_gl, unsigned i void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD src_location, DWORD dst_location) DECLSPEC_HIDDEN; -HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, - unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; void wined3d_texture_cleanup(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN;

1 0

Huw Davies : nsi: Add a stub implementation of NsiGetAllParametersEx().
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 4ed3eb477fc5ac3a20e62465eb01742713061c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed3eb477fc5ac3a20e62465… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 28 08:35:49 2021 +0100 nsi: Add a stub implementation of NsiGetAllParametersEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + const void *key; + DWORD key_size; + void *rw_data; + DWORD rw_size; + void *dynamic_data; + DWORD dynamic_size; + void *static_data; + DWORD static_size; +}; + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -128,6 +145,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, DWORD param_type, void *data, DWORD data_size, DWORD data_offset );

1 0