April 2024 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1/effect: Implement ConnectToEffectInput().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 054c9d85fe54e2d90f5b97922282f4321ffbf151 URL: https://gitlab.winehq.org/wine/wine/-/commit/054c9d85fe54e2d90f5b97922282f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 12:51:11 2024 +0200 d2d1/effect: Implement ConnectToEffectInput(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 9 ++++++++- dlls/d2d1/effect.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/d2d1/tests/d2d1.c | 11 +++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 1f5093e29a4..d59fbf10013 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -728,12 +728,19 @@ struct d2d_transform_node ID2D1TransformNode *object; }; +struct d2d_transform_node_connection +{ + struct d2d_transform_node *node; + unsigned int index; +}; + struct d2d_transform_graph { ID2D1TransformGraph ID2D1TransformGraph_iface; LONG refcount; - UINT32 input_count; + struct d2d_transform_node_connection *inputs; + unsigned int input_count; struct list nodes; }; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index f441abde2b9..a6a0d33a5a8 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -279,9 +279,17 @@ static HRESULT d2d_transform_graph_add_node(struct d2d_transform_graph *graph, static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, struct d2d_transform_node *node) { + unsigned int i; + list_remove(&node->entry); ID2D1TransformNode_Release(node->object); + for (i = 0; i < graph->input_count; ++i) + { + if (graph->inputs[i].node == node) + memset(&graph->inputs[i].node, 0, sizeof(graph->inputs[i].node)); + } + free(node); } @@ -336,6 +344,7 @@ static ULONG STDMETHODCALLTYPE d2d_transform_graph_Release(ID2D1TransformGraph * if (!refcount) { d2d_transform_graph_clear(graph); + free(graph->inputs); free(graph); } @@ -403,11 +412,28 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformG } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectToEffectInput(ID2D1TransformGraph *iface, - UINT32 input_index, ID2D1TransformNode *node, UINT32 node_index) + UINT32 input_index, ID2D1TransformNode *object, UINT32 node_index) { - FIXME("iface %p, input_index %u, node %p, node_index %u stub!\n", iface, input_index, node, node_index); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + struct d2d_transform_node *node; + unsigned int count; - return E_NOTIMPL; + TRACE("iface %p, input_index %u, object %p, node_index %u.\n", iface, input_index, object, node_index); + + if (!(node = d2d_transform_graph_get_node(graph, object))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + if (input_index >= graph->input_count) + return E_INVALIDARG; + + count = ID2D1TransformNode_GetInputCount(object); + if (node_index >= count) + return E_INVALIDARG; + + graph->inputs[input_index].node = node; + graph->inputs[input_index].index = node_index; + + return S_OK; } static void STDMETHODCALLTYPE d2d_transform_graph_Clear(ID2D1TransformGraph *iface) @@ -451,9 +477,15 @@ static HRESULT d2d_transform_graph_create(UINT32 input_count, struct d2d_transfo object->ID2D1TransformGraph_iface.lpVtbl = &d2d_transform_graph_vtbl; object->refcount = 1; - object->input_count = input_count; list_init(&object->nodes); + if (!(object->inputs = calloc(input_count, sizeof(*object->inputs)))) + { + free(object); + return E_OUTOFMEMORY; + } + object->input_count = input_count; + *graph = object; return S_OK; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 15d3b8b82ee..b2d1296bdde 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12727,6 +12727,8 @@ static void test_transform_graph(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Add nodes */ + hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 1, (ID2D1TransformNode *)offset_transform, 0); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); @@ -12734,6 +12736,15 @@ static void test_transform_graph(BOOL d3d11) hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Invalid effect input index. */ + hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 1, (ID2D1TransformNode *)offset_transform, 0); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + /* Invalid object input index. */ + hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 0, (ID2D1TransformNode *)offset_transform, 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 0, (ID2D1TransformNode *)offset_transform, 0); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + /* Remove nodes */ hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : d2d1/effect: Implement SetOutputNode().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 3d64da16ce58cb0b4bf7bcce18e9fcec59be063f URL: https://gitlab.winehq.org/wine/wine/-/commit/3d64da16ce58cb0b4bf7bcce18e9fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 12:57:57 2024 +0200 d2d1/effect: Implement SetOutputNode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 ++ dlls/d2d1/effect.c | 18 +++++++++++++++--- dlls/d2d1/tests/d2d1.c | 4 ++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index d59fbf10013..3589b508704 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -742,6 +742,8 @@ struct d2d_transform_graph struct d2d_transform_node_connection *inputs; unsigned int input_count; + struct d2d_transform_node *output; + struct list nodes; }; diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index a6a0d33a5a8..3eb1dba7ea1 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -290,6 +290,9 @@ static void d2d_transform_graph_delete_node(struct d2d_transform_graph *graph, memset(&graph->inputs[i].node, 0, sizeof(graph->inputs[i].node)); } + if (graph->output == node) + graph->output = NULL; + free(node); } @@ -396,11 +399,20 @@ static HRESULT STDMETHODCALLTYPE d2d_transform_graph_RemoveNode(ID2D1TransformGr return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1TransformGraph *iface, ID2D1TransformNode *node) +static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetOutputNode(ID2D1TransformGraph *iface, + ID2D1TransformNode *object) { - FIXME("iface %p, node %p stub!\n", iface, node); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + struct d2d_transform_node *node; - return E_NOTIMPL; + TRACE("iface %p, object %p.\n", iface, object); + + if (!(node = d2d_transform_graph_get_node(graph, object))) + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); + + graph->output = node; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_ConnectNode(ID2D1TransformGraph *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index b2d1296bdde..cb779104552 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12729,6 +12729,8 @@ static void test_transform_graph(BOOL d3d11) /* Add nodes */ hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 1, (ID2D1TransformNode *)offset_transform, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_SetOutputNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); @@ -12744,6 +12746,8 @@ static void test_transform_graph(BOOL d3d11) ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_ConnectToEffectInput(graph, 0, (ID2D1TransformNode *)offset_transform, 0); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_SetOutputNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); /* Remove nodes */ hr = ID2D1TransformGraph_RemoveNode(graph, (ID2D1TransformNode *)offset_transform);

1 0

Nikolay Sivov : d2d1/effect: Implement SetSingleTransformNode().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 7c969b0589902ab3362cc50ecbf1db61be01727e URL: https://gitlab.winehq.org/wine/wine/-/commit/7c969b0589902ab3362cc50ecbf1db… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 2 13:56:54 2024 +0200 d2d1/effect: Implement SetSingleTransformNode(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/effect.c | 28 +++++++++++++++++++++++++--- dlls/d2d1/tests/d2d1.c | 18 ++++++++++++------ 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 3eb1dba7ea1..cf715332fde 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -364,11 +364,33 @@ static UINT32 STDMETHODCALLTYPE d2d_transform_graph_GetInputCount(ID2D1Transform } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_SetSingleTransformNode(ID2D1TransformGraph *iface, - ID2D1TransformNode *node) + ID2D1TransformNode *object) { - FIXME("iface %p, node %p stub!\n", iface, node); + struct d2d_transform_graph *graph = impl_from_ID2D1TransformGraph(iface); + struct d2d_transform_node *node; + unsigned int i, input_count; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, object %p.\n", iface, object); + + d2d_transform_graph_clear(graph); + if (FAILED(hr = d2d_transform_graph_add_node(graph, object))) + return hr; + + node = d2d_transform_graph_get_node(graph, object); + graph->output = node; + + input_count = ID2D1TransformNode_GetInputCount(object); + if (graph->input_count != input_count) + return E_INVALIDARG; + + for (i = 0; i < graph->input_count; ++i) + { + graph->inputs[i].node = node; + graph->inputs[i].index = i; + } + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_transform_graph_AddNode(ID2D1TransformGraph *iface, diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index cb779104552..723cc1f8384 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -12731,6 +12731,18 @@ static void test_transform_graph(BOOL d3d11) ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_SetOutputNode(graph, (ID2D1TransformNode *)offset_transform); ok(hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "Got unexpected hr %#lx.\n", hr); + + /* Single input effect, single input node. */ + hr = ID2D1TransformGraph_SetSingleTransformNode(graph, (ID2D1TransformNode *)offset_transform); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Single input effect, two-input node. */ + hr = ID2D1TransformGraph_SetSingleTransformNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)blend_transform); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + ID2D1TransformGraph_Clear(graph); + hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1TransformGraph_AddNode(graph, (ID2D1TransformNode *)offset_transform); @@ -14507,13 +14519,7 @@ static void test_effect_custom_pixel_shader(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1DeviceContext_CreateEffect(context, &CLSID_TestEffect, &effect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - if (FAILED(hr)) - { - release_test_context(&ctx); - return; - } set_size_u(&input_size, 1, 1); pixel = 0xabcd00ff;

1 0

Hans Leidekker : wbemprox: Zero-initialize table data.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: ca89965a2e87ca842a65f76e99b1d1db6c345e8a URL: https://gitlab.winehq.org/wine/wine/-/commit/ca89965a2e87ca842a65f76e99b1d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Mar 28 10:20:37 2024 +0100 wbemprox: Zero-initialize table data. --- dlls/wbemprox/builtin.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 79affe5fdde..fa4c6ee6351 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -504,7 +504,7 @@ static const struct column col_videocontroller[] = { L"Monochrome", CIM_BOOLEAN }, { L"Name", CIM_STRING|COL_FLAG_DYNAMIC }, { L"NumberOfColorPlanes", CIM_UINT16 }, - { L"NumberofVideoPages", CIM_UINT32 }, + { L"NumberOfVideoPages", CIM_UINT32 }, { L"PNPDeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, { L"PowerManagementCapabilities", CIM_UINT16|CIM_FLAG_ARRAY }, { L"PowerManagementSupported", CIM_BOOLEAN }, @@ -1193,7 +1193,7 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) { if (!table->num_rows_allocated) { - if (!(table->data = malloc( row_count * row_size ))) return FALSE; + if (!(table->data = calloc( row_count, row_size ))) return FALSE; table->num_rows_allocated = row_count; return TRUE; } @@ -1202,6 +1202,7 @@ static BOOL resize_table( struct table *table, UINT row_count, UINT row_size ) BYTE *data; UINT count = max( row_count, table->num_rows_allocated * 2 ); if (!(data = realloc( table->data, count * row_size ))) return FALSE; + memset( data + table->num_rows_allocated * row_size, 0, (count - table->num_rows_allocated) * row_size ); table->data = data; table->num_rows_allocated = count; } @@ -1537,11 +1538,9 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond GetSystemFirmwareTable( RSMB, 0, buf, len ); rec = (struct record_bios *)table->data; - rec->currentlanguage = NULL; rec->description = L"Default System BIOS"; rec->ecmajorversion = get_bios_ec_firmware_major_release( buf, len ); rec->ecminorversion = get_bios_ec_firmware_minor_release( buf, len ); - rec->identificationcode = NULL; rec->manufacturer = get_bios_manufacturer( buf, len ); rec->name = L"Default System BIOS"; rec->releasedate = get_bios_releasedate( buf, len ); @@ -1757,8 +1756,6 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co rec = (struct record_computersystem *)table->data; rec->description = L"AT/AT COMPATIBLE"; rec->domain = L"WORKGROUP"; - rec->domainrole = 0; /* standalone workstation */ - rec->hypervisorpresent = 0; rec->manufacturer = get_compsysproduct_vendor( buf, len ); rec->model = get_compsysproduct_name( buf, len ); rec->name = get_computername(); @@ -1827,7 +1824,6 @@ static enum fill_status fill_compsysproduct( struct table *table, const struct e rec = (struct record_computersystemproduct *)table->data; rec->identifyingnumber = get_compsysproduct_identifyingnumber( buf, len ); rec->name = get_compsysproduct_name( buf, len ); - rec->skunumber = NULL; rec->uuid = get_compsysproduct_uuid( buf, len ); rec->vendor = get_compsysproduct_vendor( buf, len ); rec->version = get_compsysproduct_version( buf, len ); @@ -2580,11 +2576,9 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex swprintf( device_id, ARRAY_SIZE( device_id ), L"Disk #%u, Partition #0", index ); rec->device_id = wcsdup( device_id ); rec->diskindex = index++; - rec->index = 0; rec->pnpdevice_id = wcsdup( device_id ); get_freespace( root, &size ); rec->size = size; - rec->startingoffset = 0; rec->type = get_filesystem( root ); if (!match_row( table, row, cond, &status )) { @@ -2960,7 +2954,6 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e rec->interface_index = aa->IfIndex; rec->mac_address = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength ); rec->manufacturer = L"The Wine Project"; - rec->netconnection_id = NULL; /* FIXME Windows seems to fill this when it's connected and in use */ rec->name = wcsdup( aa->FriendlyName ); rec->netenabled = connection_status ? -1 : 0; rec->netconnection_status = connection_status; @@ -3316,7 +3309,6 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co rec->local = -1; rec->location = wcsdup( info[i].pLocation ); rec->name = wcsdup( info[i].pPrinterName ); - rec->network = 0; rec->portname = wcsdup( info[i].pPortName ); if (!match_row( table, i, cond, &status )) { @@ -3373,7 +3365,6 @@ static enum fill_status fill_process( struct table *table, const struct expr *co rec->process_id = entry.th32ProcessID; rec->pprocess_id = entry.th32ParentProcessID; rec->thread_count = entry.cntThreads; - rec->workingsetsize = 0; /* methods */ rec->create = process_create; rec->get_owner = process_get_owner; @@ -3568,7 +3559,6 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->processor_id = wcsdup( processor_id ); rec->processortype = 3; /* central processor */ rec->revision = get_processor_revision(); - rec->unique_id = NULL; rec->version = wcsdup( version ); if (!match_row( table, i, cond, &status )) { @@ -4265,16 +4255,13 @@ static enum fill_status fill_videocontroller( struct table *table, const struct } rec = (struct record_videocontroller *)table->data; - memset( rec, 0, sizeof(*rec) ); rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ rec->caption = wcsdup( name ); - rec->config_errorcode = 0; /* no error */ rec->current_bitsperpixel = get_bitsperpixel( &hres, &vres ); rec->current_horizontalres = hres; - rec->current_refreshrate = 0; /* default refresh rate */ rec->current_scanmode = 2; /* Unknown */ rec->current_verticalres = vres; rec->description = wcsdup( name );

1 0

Conor McCarthy : tests/hlsl: Add tests for asdouble().
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: cf6e518f1e68d9ef89c40f7138d357b529cec56d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cf6e518f1e68d9ef89c40f7138d35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 19 00:21:27 2024 +1000 tests/hlsl: Add tests for asdouble(). --- tests/hlsl/cast-64-bit.shader_test | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index 1e33d811..41a1af4d 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -36,6 +36,37 @@ todo(sm<6) draw quad probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) +[pixel shader todo] +uniform uint4 u; + +float4 main() : sv_target +{ + // Low bits, high bits + double2 d = asdouble(u.xz, u.yw); + return float4(d, 0, 0); +} + +[test] +uniform 0 uint4 0xc000000 0x40020000 0x80000000 0xc04be000 +todo draw quad +probe all rgba (2.25, -55.75001526, 0.0, 0.0) 1 + + +[pixel shader todo] +uniform uint2 u; + +float4 main() : sv_target +{ + double d = asdouble(u.x, u.y); + return float4(d, 0, 0, 0); +} + +[test] +uniform 0 uint4 0x80000000 0xc04be000 0 0 +todo draw quad +probe all rgba (-55.75001526, 0.0, 0.0, 0.0) 1 + + [require] shader model >= 6.0 int64

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic MakeDouble.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: vkd3d Branch: master Commit: 2909a5aaccab01610de322b5af57eac2b710d507 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2909a5aaccab01610de322b5af57e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Mar 19 00:22:51 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic MakeDouble. --- libs/vkd3d-shader/dxil.c | 28 ++++++++++++++++++++++++++++ tests/hlsl/cast-64-bit.shader_test | 4 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0787ee13..c2c12aec 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -410,6 +410,7 @@ enum dx_intrinsic_opcode DX_GROUP_ID = 94, DX_THREAD_ID_IN_GROUP = 95, DX_FLATTENED_THREAD_ID_IN_GROUP = 96, + DX_MAKE_DOUBLE = 101, DX_SPLIT_DOUBLE = 102, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, @@ -2372,6 +2373,12 @@ static void src_param_init_scalar(struct vkd3d_shader_src_param *param, unsigned param->modifiers = VKD3DSPSM_NONE; } +static void src_param_init_vector(struct vkd3d_shader_src_param *param, unsigned int component_count) +{ + param->swizzle = VKD3D_SHADER_NO_SWIZZLE & ((1ull << VKD3D_SHADER_SWIZZLE_SHIFT(component_count)) - 1); + param->modifiers = VKD3DSPSM_NONE; +} + static void src_param_init_from_value(struct vkd3d_shader_src_param *param, const struct sm6_value *src) { src_param_init(param); @@ -4699,6 +4706,26 @@ static void sm6_parser_emit_dx_load_input(struct sm6_parser *sm6, enum dx_intrin instruction_dst_param_init_ssa_scalar(ins, sm6); } +static void sm6_parser_emit_dx_make_double(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_src_param *src_params; + struct vkd3d_shader_instruction *ins; + struct vkd3d_shader_register reg; + + if (!sm6_parser_emit_composite_construct(sm6, &operands[0], 2, state, &reg)) + return; + + ins = state->ins; + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + if (!(src_params = instruction_src_params_alloc(ins, 1, sm6))) + return; + src_params[0].reg = reg; + src_param_init_vector(&src_params[0], 2); + + instruction_dst_param_init_ssa_scalar(ins, sm6); +} + static void sm6_parser_emit_dx_raw_buffer_load(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -5356,6 +5383,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary}, [DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input}, [DX_LOG ] = {"g", "R", sm6_parser_emit_dx_unary}, + [DX_MAKE_DOUBLE ] = {"d", "ii", sm6_parser_emit_dx_make_double}, [DX_RAW_BUFFER_LOAD ] = {"o", "Hii8i", sm6_parser_emit_dx_raw_buffer_load}, [DX_RAW_BUFFER_STORE ] = {"v", "Hiioooocc", sm6_parser_emit_dx_raw_buffer_store}, [DX_ROUND_NE ] = {"g", "R", sm6_parser_emit_dx_unary}, diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index 41a1af4d..f488570e 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -48,7 +48,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0xc000000 0x40020000 0x80000000 0xc04be000 -todo draw quad +todo(sm<6) draw quad probe all rgba (2.25, -55.75001526, 0.0, 0.0) 1 @@ -63,7 +63,7 @@ float4 main() : sv_target [test] uniform 0 uint4 0x80000000 0xc04be000 0 0 -todo draw quad +todo(sm<6) draw quad probe all rgba (-55.75001526, 0.0, 0.0, 0.0) 1

1 0

Louis Lenders : wbemprox: Add property 'Status' to Win32_BIOS.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 7cd0f395cafecac0dcff9ebc6ae79b6521014cd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cd0f395cafecac0dcff9ebc6ae79b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sun Mar 31 11:10:49 2024 +0200 wbemprox: Add property 'Status' to Win32_BIOS. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56361 --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8a7a092cee1..79affe5fdde 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -81,6 +81,7 @@ static const struct column col_bios[] = { L"SMBIOSBIOSVersion", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SMBIOSMajorVersion", CIM_UINT16 }, { L"SMBIOSMinorVersion", CIM_UINT16 }, + { L"Status", CIM_STRING }, { L"SystemBiosMajorVersion", CIM_UINT8 }, { L"SystemBiosMinorVersion", CIM_UINT8 }, { L"Version", CIM_STRING|COL_FLAG_KEY }, @@ -572,6 +573,7 @@ struct record_bios const WCHAR *smbiosbiosversion; UINT16 smbiosmajorversion; UINT16 smbiosminorversion; + const WCHAR *status; UINT8 systembiosmajorversion; UINT8 systembiosminorversion; const WCHAR *version; @@ -1547,6 +1549,7 @@ static enum fill_status fill_bios( struct table *table, const struct expr *cond rec->smbiosbiosversion = get_bios_smbiosbiosversion( buf, len ); rec->smbiosmajorversion = get_bios_smbiosmajorversion( buf, len ); rec->smbiosminorversion = get_bios_smbiosminorversion( buf, len ); + rec->status = L"OK"; rec->systembiosmajorversion = get_bios_system_bios_major_release( buf, len ); rec->systembiosminorversion = get_bios_system_bios_minor_release( buf, len ); rec->version = L"WINE - 1"; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f06e0a431ea..ea108e31e49 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -483,6 +483,7 @@ static void test_Win32_Bios( IWbemServices *services ) check_property( obj, L"SMBIOSBIOSVersion", VT_BSTR, CIM_STRING ); check_property( obj, L"SMBIOSMajorVersion", VT_I4, CIM_UINT16 ); check_property( obj, L"SMBIOSMinorVersion", VT_I4, CIM_UINT16 ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"Version", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj );

1 0

Alexandre Julliard : widl: Always use new-style format strings in interpreted mode.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 896b4f05ea5e9f0f204164387a983d6572240c49 URL: https://gitlab.winehq.org/wine/wine/-/commit/896b4f05ea5e9f0f204164387a983d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 20:42:41 2024 +0200 widl: Always use new-style format strings in interpreted mode. --- tools/widl/client.c | 9 ++- tools/widl/proxy.c | 23 ++++--- tools/widl/server.c | 4 +- tools/widl/typegen.c | 166 ++++++++++++++++++--------------------------------- tools/widl/widl.c | 19 ++---- tools/widl/widl.h | 8 +-- 6 files changed, 82 insertions(+), 147 deletions(-)

1 0

Alexandre Julliard : widl: Add /robust flags in correlation descriptors.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 4d8ee6bb18f42e125ffd51a28348687e55b56776 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d8ee6bb18f42e125ffd51a2834868… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 20:47:03 2024 +0200 widl: Add /robust flags in correlation descriptors. --- dlls/rpcrt4/ndr_marshall.c | 11 +++-------- dlls/rpcrt4/ndr_typelib.c | 12 +++++++----- tools/widl/client.c | 4 ++++ tools/widl/server.c | 5 +++++ tools/widl/typegen.c | 21 ++++++++++++--------- 5 files changed, 31 insertions(+), 22 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 5ed6b6364ec..c68eb0ee57e 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -7259,15 +7259,13 @@ NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, */ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, ULONG CacheSize, ULONG Flags) { - static int once; - - if (!once++) - FIXME("(%p, %p, %ld, 0x%lx): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + TRACE("(%p, %p, %ld, 0x%lx)\n", pStubMsg, pMemory, CacheSize, Flags); if (pStubMsg->CorrDespIncrement == 0) pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ pStubMsg->fHasNewCorrDesc = TRUE; + pStubMsg->pCorrInfo = pMemory; } /*********************************************************************** @@ -7300,8 +7298,5 @@ void WINAPI NdrCorrelationPass(PMIDL_STUB_MESSAGE pStubMsg) */ void WINAPI NdrCorrelationFree(PMIDL_STUB_MESSAGE pStubMsg) { - static int once; - - if (!once++) - FIXME("(%p): stub\n", pStubMsg); + /* FIXME: free memory */ } diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 352f71fa68b..76046973fa8 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -640,7 +640,9 @@ static size_t write_array_tfs(ITypeInfo *typeinfo, unsigned char *str, { WRITE_SHORT(str, *len, size); WRITE_INT(str, *len, 0xffffffff); /* conformance */ + WRITE_SHORT(str, *len, 0); WRITE_INT(str, *len, 0xffffffff); /* variance */ + WRITE_SHORT(str, *len, 0); } else { @@ -1099,18 +1101,18 @@ static void write_proc_func_header(ITypeInfo *typeinfo, FUNCDESC *desc, WRITE_SHORT(proc, *proclen, 0); /* constant_client_buffer_size */ WRITE_SHORT(proc, *proclen, 0); /* constant_server_buffer_size */ -#ifdef __x86_64__ WRITE_CHAR (proc, *proclen, 0x47); /* HasExtensions | HasReturn | ClientMustSize | ServerMustSize */ -#else - WRITE_CHAR (proc, *proclen, 0x07); /* HasReturn | ClientMustSize | ServerMustSize */ -#endif WRITE_CHAR (proc, *proclen, desc->cParams + 1); /* incl. return value */ #ifdef __x86_64__ WRITE_CHAR (proc, *proclen, 10); /* extension size */ - WRITE_CHAR (proc, *proclen, 0); /* INTERPRETER_OPT_FLAGS2 */ +#else + WRITE_CHAR (proc, *proclen, 8); /* extension size */ +#endif + WRITE_CHAR (proc, *proclen, 1); /* HasNewCorrDesc */ WRITE_SHORT(proc, *proclen, 0); /* ClientCorrHint */ WRITE_SHORT(proc, *proclen, 0); /* ServerCorrHint */ WRITE_SHORT(proc, *proclen, 0); /* NotifyIndex */ +#ifdef __x86_64__ for (param_idx = 0; param_idx < desc->cParams && param_idx < 3; param_idx++) { basetype = get_basetype(typeinfo, &desc->lprgelemdescParam[param_idx].tdesc); diff --git a/tools/widl/client.c b/tools/widl/client.c index b73ce917dc3..795e3ba2104 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -106,6 +106,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, if (has_full_pointer) write_full_pointer_free(client, indent, func); + if (interpreted_mode) print_client("NdrCorrelationFree(&__frame->_StubMsg);\n"); print_client("NdrFreeBuffer(&__frame->_StubMsg);\n"); if (explicit_fc == FC_BIND_GENERIC) @@ -134,6 +135,7 @@ static void write_function_stub( const type_t *iface, const var_t *func, write_type_decl(client, &retval->declspec, retval->name); fprintf(client, ";\n"); } + if (interpreted_mode) print_client("ULONG _NdrCorrCache[256];\n"); print_client("RPC_MESSAGE _RpcMessage;\n"); if (handle_var) @@ -213,6 +215,8 @@ static void write_function_stub( const type_t *iface, const var_t *func, } break; } + if (interpreted_mode) + print_client( "NdrCorrelationInitialize(&__frame->_StubMsg, _NdrCorrCache, sizeof(_NdrCorrCache), 0);\n" ); write_remoting_arguments(client, indent, func, "", PASS_IN, PHASE_BUFFERSIZE); diff --git a/tools/widl/server.c b/tools/widl/server.c index 9ad7c27e002..8bc179f1438 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -69,6 +69,8 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned print_server("static void __finally_%s_%s(", iface->name, get_name(func)); fprintf(server," struct __frame_%s_%s *__frame )\n{\n", iface->name, get_name(func)); + if (interpreted_mode) print_server("NdrCorrelationFree(&__frame->_StubMsg);\n"); + indent++; write_remoting_arguments(server, indent, func, "__frame->", PASS_OUT, PHASE_FREE); @@ -87,6 +89,7 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned fprintf(server, "{\n"); indent++; print_server("struct __frame_%s_%s __f, * const __frame = &__f;\n", iface->name, get_name(func)); + if (interpreted_mode) print_server("ULONG _NdrCorrCache[256];\n"); if (has_out_arg_or_return(func)) print_server("RPC_STATUS _Status;\n"); fprintf(server, "\n"); @@ -113,6 +116,8 @@ static void write_function_stub(const type_t *iface, const var_t *func, unsigned print_server("RpcTryExcept\n"); print_server("{\n"); indent++; + if (interpreted_mode) + print_server("NdrCorrelationInitialize(&__frame->_StubMsg, _NdrCorrCache, sizeof(_NdrCorrCache), 0);\n" ); if (has_full_pointer) write_full_pointer_init(server, indent, func, TRUE); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f4f8c593aba..df25cdb6901 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1342,7 +1342,7 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, const var_t *handle_var = get_func_handle_var( iface, func, &explicit_fc, &implicit_fc ); unsigned char oi_flags = Oi_HAS_RPCFLAGS | Oi_USE_NEW_INIT_ROUTINES; unsigned char oi2_flags = get_func_oi2_flags( func ); - unsigned char ext_flags = 0; + unsigned char ext_flags = 0x01; /* HasNewCorrDesc */ unsigned int rpc_flags = get_rpc_flags( func->attrs ); unsigned int nb_args = 0; unsigned int stack_size = 0; @@ -1621,6 +1621,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, { unsigned char operator_type = 0; unsigned char conftype = FC_NORMAL_CONFORMANCE; + unsigned short robust_flags = 0; const char *conftype_string = "field"; const expr_t *subexpr; const type_t *iface = NULL; @@ -1629,7 +1630,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (!expr) { print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); - return 4; + goto done; } if (expr->is_const) @@ -1643,8 +1644,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, FC_CONSTANT_CONFORMANCE, expr->cval); print_file(file, 2, "0x%x,\n", expr->cval >> 16); print_file(file, 2, "NdrFcShort(0x%hx),\n", (unsigned short)expr->cval); - - return 4; + goto done; } if (!cont_type) /* top-level conformance */ @@ -1854,7 +1854,10 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, print_file(file, 2, "0x0,\n" ); print_file(file, 2, "NdrFcShort(0x0),\n" ); } - return 4; +done: + if (!interpreted_mode) return 4; + print_file(file, 2, "NdrFcShort(0x%hx),\n", robust_flags); + return 6; } /* return size and start offset of a data field based on current offset */ @@ -2495,15 +2498,15 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) unsigned int absoff = ft->typestring_offset; if (is_attr(ft->attrs, ATTR_SWITCHTYPE)) absoff += 8; /* we already have a corr descr, skip it */ - reloff = absoff - (*tfsoff + 6); print_file(file, 0, "/* %d */\n", *tfsoff); print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); - write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS)); + *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, + get_attrp(f->attrs, ATTR_SWITCHIS)); + reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff); - *tfsoff += 8; + *tfsoff += 2; } offset += size; }

1 0

Alexandre Julliard : widl: Output more correct /robust flags.
by Alexandre Julliard 02 Apr '24

02 Apr '24

Module: wine Branch: master Commit: 66bec1943485b39b793c5b10f81c4decf3568434 URL: https://gitlab.winehq.org/wine/wine/-/commit/66bec1943485b39b793c5b10f81c4d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 2 14:23:12 2024 +0200 widl: Output more correct /robust flags. --- tools/widl/typegen.c | 54 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 23 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index df25cdb6901..0b2caea8a19 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -44,6 +44,7 @@ static const type_t *current_structure; static const var_t *current_func; +static const var_t *current_arg; static const type_t *current_iface; static struct list expr_eval_routines = LIST_INIT(expr_eval_routines); @@ -79,6 +80,12 @@ static const unsigned short IsSimpleRef = 0x0100; /* static const unsigned short IsDontCallFreeInst = 0x0200; */ /* static const unsigned short SaveForAsyncFinish = 0x0400; */ +/* robust flags in correlation descriptors */ +static const unsigned short RobustEarly = 0x0001; +/* static const unsigned short RobustSplit = 0x0002; */ +static const unsigned short RobustIsIIdIs = 0x0004; +/* static const unsigned short RobustDontCheck = 0x0008; */ + static unsigned int field_memsize(const type_t *type, unsigned int *offset); static unsigned int fields_memsize(const var_list_t *fields, unsigned int *align); static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *type, @@ -1617,16 +1624,16 @@ static int write_base_type(FILE *file, const type_t *type, unsigned int *typestr /* write conformance / variance descriptor */ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, unsigned int baseoff, const type_t *type, - const expr_t *expr) + const expr_t *expr, unsigned short robust_flags) { unsigned char operator_type = 0; unsigned char conftype = FC_NORMAL_CONFORMANCE; - unsigned short robust_flags = 0; const char *conftype_string = "field"; const expr_t *subexpr; const type_t *iface = NULL; const char *name; + robust_flags |= RobustEarly; if (!expr) { print_file(file, 2, "NdrFcLong(0xffffffff),\t/* -1 */\n"); @@ -1726,6 +1733,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, break; } offset += get_stack_size( var, NULL ); + if (var == current_arg) robust_flags &= ~RobustEarly; } } else @@ -1840,6 +1848,7 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, eval->expr = expr; list_add_tail (&expr_eval_routines, &eval->entry); } + robust_flags &= ~RobustEarly; if (callback_offset > USHRT_MAX) error("Maximum number of callback routines reached\n"); @@ -2502,7 +2511,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) print_file(file, 2, "0x%x,\t/* FC_NON_ENCAPSULATED_UNION */\n", FC_NON_ENCAPSULATED_UNION); print_file(file, 2, "0x%x,\t/* FIXME: always FC_LONG */\n", FC_LONG); *tfsoff += 2 + write_conf_or_var_desc(file, current_structure, offset, ft, - get_attrp(f->attrs, ATTR_SWITCHIS)); + get_attrp(f->attrs, ATTR_SWITCHIS), 0); reloff = absoff - *tfsoff; print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", (unsigned short)reloff, reloff, absoff); @@ -2991,7 +3000,7 @@ static unsigned int write_string_tfs(FILE *file, const attr_list_t *attrs, (!type_array_is_decl_as_ptr(type) && current_structure ? type_memsize(current_structure) : 0), - type, type_array_get_conformance(type)); + type, type_array_get_conformance(type), 0); update_tfsoff(type, start_offset, file); return start_offset; @@ -3057,7 +3066,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (is_conformant_array(type)) *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, - type, size_is); + type, size_is, 0); if (fc == FC_SMVARRAY || fc == FC_LGVARRAY) { @@ -3081,8 +3090,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (length_is) *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, length_is); + += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is, 0); if (type_has_pointers(type_array_get_element_type(type)) && (type_array_is_decl_as_ptr(type) || !current_structure)) @@ -3103,12 +3111,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int dim = size_is ? 0 : type_array_get_dim(type); print_file(file, 2, "NdrFcShort(0x%hx),\t/* %u */\n", (unsigned short)dim, dim); *typestring_offset += 2; - *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, size_is); - *typestring_offset - += write_conf_or_var_desc(file, current_structure, baseoff, - type, length_is); + *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, size_is, 0); + *typestring_offset += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is, 0); write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, TRUE, typestring_offset); write_end(file, typestring_offset); @@ -3474,7 +3478,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", fc, string_of_type(fc)); *tfsoff += 2; - *tfsoff += write_conf_or_var_desc(file, current_structure, 0, st, switch_is ); + *tfsoff += write_conf_or_var_desc(file, current_structure, 0, st, switch_is, 0); print_file(file, 2, "NdrFcShort(0x2),\t/* Offset= 2 (%u) */\n", *tfsoff + 2); *tfsoff += 2; print_file(file, 0, "/* %u */\n", *tfsoff); @@ -3543,8 +3547,8 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t { print_file(file, 2, "0x2f, /* FC_IP */\n"); print_file(file, 2, "0x5c, /* FC_PAD */\n"); - *typeformat_offset - += write_conf_or_var_desc(file, current_structure, 0, type, iid) + 2; + *typeformat_offset += 2 + write_conf_or_var_desc(file, current_structure, 0, + type, iid, RobustIsIIdIs); } else { @@ -3755,24 +3759,28 @@ static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned in { case STMT_DECLARATION: { - const var_t *func = stmt->u.var; + const var_t *func; + const var_list_t *args; if(stmt->u.var->declspec.stgclass != STG_NONE || type_get_type_detect_alias(stmt->u.var->declspec.type) != TYPE_FUNCTION) continue; - current_func = func; + current_func = func = stmt->u.var; if (is_local(func->attrs)) continue; - var = type_function_get_retval(func->declspec.type); + current_arg = var = type_function_get_retval(func->declspec.type); if (!is_void(var->declspec.type)) var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, func->name, TYPE_CONTEXT_RETVAL, offset); - if (type_function_get_args(func->declspec.type)) - LIST_FOR_EACH_ENTRY( var, type_function_get_args(func->declspec.type), var_t, entry ) - var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, offset ); + args = type_function_get_args(func->declspec.type); + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + current_arg = var; + var->typestring_offset = write_type_tfs( file, var->attrs, var->declspec.type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, offset ); + } break; }

1 0