July 2022 - Wine-commits - list.winehq.org

Hans Leidekker : secur32/tests: Add more context attributes tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: c77b23a3e760d423335d0a9cdc725e05f7d107c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/c77b23a3e760d423335d0a9cdc725e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 8 12:11:00 2022 +0200 secur32/tests: Add more context attributes tests. --- dlls/secur32/tests/ntlm.c | 52 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 6665af6bb76..4accf4b2d79 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -33,6 +33,7 @@ #include <rpc.h> #include <rpcdce.h> #include <secext.h> +#include <wincrypt.h> #include "wine/test.h" @@ -819,8 +820,10 @@ static void testAuth(ULONG data_rep, BOOL fake) BOOL first = TRUE; SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; - SecPkgContext_Sizes ctxt_sizes; + SecPkgContext_Sizes sizes; + SecPkgContext_StreamSizes stream_sizes; SecPkgContext_NegotiationInfoA info; + SecPkgContext_KeyInfoA key; SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) @@ -895,24 +898,35 @@ static void testAuth(ULONG data_rep, BOOL fake) goto tAuthend; } - sec_status = pQueryContextAttributesA(&client.ctxt, - SECPKG_ATTR_SIZES, &ctxt_sizes); - - ok(sec_status == SEC_E_OK, - "pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned %s\n", - getSecError(sec_status)); - ok((ctxt_sizes.cbMaxToken == 1904) || (ctxt_sizes.cbMaxToken == 2888), - "cbMaxToken should be 1904 or 2888 but is %lu\n", - ctxt_sizes.cbMaxToken); - ok(ctxt_sizes.cbMaxSignature == 16, - "cbMaxSignature should be 16 but is %lu\n", - ctxt_sizes.cbMaxSignature); - ok(ctxt_sizes.cbSecurityTrailer == 16, - "cbSecurityTrailer should be 16 but is %lu\n", - ctxt_sizes.cbSecurityTrailer); - ok(ctxt_sizes.cbBlockSize == 0, - "cbBlockSize should be 0 but is %lu\n", - ctxt_sizes.cbBlockSize); + sec_status = pQueryContextAttributesA(&client.ctxt, SECPKG_ATTR_SIZES, &sizes); + ok(sec_status == SEC_E_OK, "pQueryContextAttributesA(SECPKG_ATTR_SIZES) returned %s\n", getSecError(sec_status)); + ok((sizes.cbMaxToken == 1904) || (sizes.cbMaxToken == 2888), "cbMaxToken should be 1904 or 2888 but is %lu\n", + sizes.cbMaxToken); + ok(sizes.cbMaxSignature == 16, "cbMaxSignature should be 16 but is %lu\n", sizes.cbMaxSignature); + ok(sizes.cbSecurityTrailer == 16, "cbSecurityTrailer should be 16 but is %lu\n", sizes.cbSecurityTrailer); + ok(sizes.cbBlockSize == 0, "cbBlockSize should be 0 but is %lu\n", sizes.cbBlockSize); + + sec_status = pQueryContextAttributesA(&client.ctxt, SECPKG_ATTR_STREAM_SIZES, &stream_sizes); + ok(sec_status == SEC_E_UNSUPPORTED_FUNCTION, "pQueryContextAttributesA(SECPKG_ATTR_STREAM_SIZES) returned %s\n", + getSecError(sec_status)); + + memset( &key, 0, sizeof(key) ); + sec_status = QueryContextAttributesA( &client.ctxt, SECPKG_ATTR_KEY_INFO, &key ); + ok( sec_status == SEC_E_OK, "pQueryContextAttributesA returned %08lx\n", sec_status ); + if (fake) + { + ok( !strcmp(key.sSignatureAlgorithmName, "RSADSI RC4-CRC32"), "got '%s'\n", key.sSignatureAlgorithmName ); + ok( !strcmp(key.sEncryptAlgorithmName, "RSADSI RC4"), "got '%s'\n", key.sEncryptAlgorithmName ); + ok( key.SignatureAlgorithm == 0xffffff7c, "got %#lx\n", key.SignatureAlgorithm ); + } + else + { + ok( !strcmp(key.sSignatureAlgorithmName, "HMAC-MD5"), "got '%s'\n", key.sSignatureAlgorithmName ); + ok( !strcmp(key.sEncryptAlgorithmName, "RSADSI RC4"), "got '%s'\n", key.sEncryptAlgorithmName ); + ok( key.SignatureAlgorithm == 0xffffff76, "got %#lx\n", key.SignatureAlgorithm ); + } + ok( key.KeySize == 128, "got %lu\n", key.KeySize ); + ok( key.EncryptAlgorithm == CALG_RC4, "got %#lx\n", key.EncryptAlgorithm ); memset(&info, 0, sizeof(info)); sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info);

1 0

Zebediah Figura : wined3d: Introduce a wined3d_streaming_buffer helper.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 55223e2573c226ddf6f058ac5db64ac6e2b78399 URL: https://gitlab.winehq.org/wine/wine/-/commit/55223e2573c226ddf6f058ac5db64a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 18:05:21 2022 -0500 wined3d: Introduce a wined3d_streaming_buffer helper. --- dlls/wined3d/buffer.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 24 +++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 9b0d98139ce..2131123bf44 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1647,3 +1647,81 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct return device->adapter->adapter_ops->adapter_create_buffer(device, desc, data, parent, parent_ops, buffer); } + +static HRESULT wined3d_streaming_buffer_prepare(struct wined3d_device *device, + struct wined3d_streaming_buffer *buffer, unsigned int min_size) +{ + struct wined3d_buffer *wined3d_buffer; + struct wined3d_buffer_desc desc; + unsigned int old_size = 0; + unsigned int size; + HRESULT hr; + + if (buffer->buffer) + { + old_size = buffer->buffer->resource.size; + if (old_size >= min_size) + return S_OK; + } + + size = max(old_size * 2, min_size); + TRACE("Growing buffer to %u bytes.\n", size); + + desc.byte_width = size; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.bind_flags = buffer->bind_flags; + desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.misc_flags = 0; + desc.structure_byte_stride = 0; + + if (SUCCEEDED(hr = wined3d_buffer_create(device, &desc, NULL, NULL, &wined3d_null_parent_ops, &wined3d_buffer))) + { + if (buffer->buffer) + wined3d_buffer_decref(buffer->buffer); + buffer->buffer = wined3d_buffer; + buffer->pos = 0; + } + return hr; +} + +HRESULT CDECL wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *ret_pos) +{ + unsigned int map_flags = WINED3D_MAP_WRITE; + struct wined3d_resource *resource; + struct wined3d_map_desc map_desc; + unsigned int pos, align; + struct wined3d_box box; + HRESULT hr; + + TRACE("device %p, buffer %p, data %p, size %u, stride %u, ret_pos %p.\n", + device, buffer, data, size, stride, ret_pos); + + if (FAILED(hr = wined3d_streaming_buffer_prepare(device, buffer, size))) + return hr; + resource = &buffer->buffer->resource; + + pos = buffer->pos; + if ((align = pos % stride)) + align = stride - align; + if (pos + size + align > resource->size) + { + pos = 0; + map_flags |= WINED3D_MAP_DISCARD; + } + else + { + pos += align; + map_flags |= WINED3D_MAP_NOOVERWRITE; + } + + wined3d_box_set(&box, pos, 0, pos + size, 1, 0, 1); + if (SUCCEEDED(hr = wined3d_resource_map(resource, 0, &map_desc, &box, map_flags))) + { + memcpy(map_desc.data, data, size); + wined3d_resource_unmap(resource, 0); + *ret_pos = pos; + buffer->pos = pos + size; + } + return hr; +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 63220e1222c..1f9c398a5c5 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -260,6 +260,8 @@ @ cdecl wined3d_stateblock_set_vs_consts_f(ptr long long ptr) @ cdecl wined3d_stateblock_set_vs_consts_i(ptr long long ptr) +@ cdecl wined3d_streaming_buffer_upload(ptr ptr ptr long long ptr) + @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 116aea82348..ce2da6e4c04 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2320,6 +2320,13 @@ struct wined3d_private_data typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resource); +struct wined3d_streaming_buffer +{ + struct wined3d_buffer *buffer; + unsigned int pos; + unsigned int bind_flags; +}; + void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); @@ -2825,6 +2832,9 @@ HRESULT __cdecl wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *st HRESULT __cdecl wined3d_stateblock_set_vs_consts_i(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); +HRESULT __cdecl wined3d_streaming_buffer_upload(struct wined3d_device *device, struct wined3d_streaming_buffer *buffer, + const void *data, unsigned int size, unsigned int stride, unsigned int *pos); + HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, struct wined3d_swapchain_state_parent *state_parent, void *parent, const struct wined3d_parent_ops *parent_ops, @@ -2922,6 +2932,20 @@ ULONG __cdecl wined3d_vertex_declaration_incref(struct wined3d_vertex_declaratio HRESULT __cdecl wined3d_extract_shader_input_signature_from_dxbc(struct wined3d_shader_signature *signature, const void *byte_code, SIZE_T byte_code_size); +static inline void wined3d_streaming_buffer_init(struct wined3d_streaming_buffer *buffer, unsigned int bind_flags) +{ + memset(buffer, 0, sizeof(*buffer)); + buffer->bind_flags = bind_flags; +} + +static inline void wined3d_streaming_buffer_cleanup(struct wined3d_streaming_buffer *buffer) +{ + if (buffer->buffer) + wined3d_buffer_decref(buffer->buffer); + buffer->buffer = NULL; + buffer->pos = 0; +} + /* Return the integer base-2 logarithm of x. Undefined for x == 0. */ static inline unsigned int wined3d_log2i(unsigned int x) {

1 0

Zebediah Figura : d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 301a48f12daf7e21f8d7e73c907293a2bd0187bd URL: https://gitlab.winehq.org/wine/wine/-/commit/301a48f12daf7e21f8d7e73c907293… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 18:15:04 2022 -0500 d3d8: Use the wined3d_streaming_buffer helpers to manage the streaming vertex buffer. --- dlls/d3d8/d3d8_private.h | 5 +-- dlls/d3d8/device.c | 105 ++++++----------------------------------------- 2 files changed, 14 insertions(+), 96 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 755991a64c7..53d131f182d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -123,10 +123,7 @@ struct d3d8_device struct FvfToDecl *decls; UINT numConvertedDecls, declArraySize; - /* User data draws */ - struct wined3d_buffer *vertex_buffer; - UINT vertex_buffer_size; - UINT vertex_buffer_pos; + struct wined3d_streaming_buffer vertex_buffer; struct wined3d_buffer *index_buffer; UINT index_buffer_size; UINT index_buffer_pos; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6c1646a1893..ee12d3809e6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -625,8 +625,7 @@ static ULONG WINAPI d3d8_device_Release(IDirect3DDevice8 *iface) } heap_free(device->decls); - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) wined3d_buffer_decref(device->index_buffer); @@ -963,12 +962,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, wined3d_mutex_lock(); - if (device->vertex_buffer) - { - wined3d_buffer_decref(device->vertex_buffer); - device->vertex_buffer = NULL; - device->vertex_buffer_size = 0; - } + wined3d_streaming_buffer_cleanup(&device->vertex_buffer); if (device->index_buffer) { wined3d_buffer_decref(device->index_buffer); @@ -2546,55 +2540,15 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, return D3D_OK; } -/* The caller is responsible for wined3d locking */ -static HRESULT d3d8_device_prepare_vertex_buffer(struct d3d8_device *device, UINT min_size) -{ - HRESULT hr; - - if (device->vertex_buffer_size < min_size || !device->vertex_buffer) - { - UINT size = max(device->vertex_buffer_size * 2, min_size); - struct wined3d_buffer_desc desc; - struct wined3d_buffer *buffer; - - TRACE("Growing vertex buffer to %u bytes\n", size); - - desc.byte_width = size; - desc.usage = WINED3DUSAGE_DYNAMIC; - desc.bind_flags = WINED3D_BIND_VERTEX_BUFFER; - desc.access = WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_MAP_W; - desc.misc_flags = 0; - desc.structure_byte_stride = 0; - - if (FAILED(hr = wined3d_buffer_create(device->wined3d_device, &desc, - NULL, NULL, &d3d8_null_wined3d_parent_ops, &buffer))) - { - ERR("Failed to create vertex buffer, hr %#x.\n", hr); - return hr; - } - - if (device->vertex_buffer) - wined3d_buffer_decref(device->vertex_buffer); - - device->vertex_buffer = buffer; - device->vertex_buffer_size = size; - device->vertex_buffer_pos = 0; - } - return D3D_OK; -} - static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, D3DPRIMITIVETYPE primitive_type, UINT primitive_count, const void *data, UINT stride) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; UINT vtx_count = vertex_count_from_primitive_count(primitive_type, primitive_count); - struct wined3d_map_desc wined3d_map_desc; - struct wined3d_box wined3d_box = {0}; UINT size = vtx_count * stride; - struct wined3d_resource *vb; - UINT vb_pos, align; + unsigned int vb_pos; + HRESULT hr; TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", iface, primitive_type, primitive_count, data, stride); @@ -2606,29 +2560,12 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); - hr = d3d8_device_prepare_vertex_buffer(device, size); - if (FAILED(hr)) - goto done; - vb_pos = device->vertex_buffer_pos; - align = vb_pos % stride; - if (align) align = stride - align; - if (vb_pos + size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, + &device->vertex_buffer, data, size, stride, &vb_pos))) goto done; - memcpy(wined3d_map_desc.data, data, size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + size; - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, stride); if (FAILED(hr)) goto done; @@ -2692,8 +2629,8 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface UINT idx_size = idx_count * idx_fmt_size; struct wined3d_map_desc wined3d_map_desc; struct wined3d_box wined3d_box = {0}; - struct wined3d_resource *ib, *vb; unsigned int base_vertex_idx; + struct wined3d_resource *ib; UINT vb_pos, ib_pos, align; HRESULT hr; @@ -2710,27 +2647,9 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_mutex_lock(); - hr = d3d8_device_prepare_vertex_buffer(device, vtx_size); - if (FAILED(hr)) - goto done; - - vb_pos = device->vertex_buffer_pos; - align = vb_pos % vertex_stride; - if (align) align = vertex_stride - align; - if (vb_pos + vtx_size + align > device->vertex_buffer_size) - vb_pos = 0; - else - vb_pos += align; - - wined3d_box.left = vb_pos; - wined3d_box.right = vb_pos + vtx_size; - vb = wined3d_buffer_get_resource(device->vertex_buffer); - if (FAILED(hr = wined3d_resource_map(vb, 0, &wined3d_map_desc, &wined3d_box, - WINED3D_MAP_WRITE | (vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD)))) + if (FAILED(hr = wined3d_streaming_buffer_upload(device->wined3d_device, &device->vertex_buffer, + (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size, vertex_stride, &vb_pos))) goto done; - memcpy(wined3d_map_desc.data, (char *)vertex_data + min_vertex_idx * vertex_stride, vtx_size); - wined3d_resource_unmap(vb, 0); - device->vertex_buffer_pos = vb_pos + vtx_size; hr = d3d8_device_prepare_index_buffer(device, idx_size); if (FAILED(hr)) @@ -2754,7 +2673,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3d_resource_unmap(ib, 0); device->index_buffer_pos = ib_pos + idx_size; - hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer, 0, vertex_stride); + hr = wined3d_stateblock_set_stream_source(device->state, 0, device->vertex_buffer.buffer, 0, vertex_stride); if (FAILED(hr)) goto done; @@ -3799,6 +3718,8 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine device->stateblock_state = wined3d_stateblock_get_state(device->state); device->update_state = device->state; + wined3d_streaming_buffer_init(&device->vertex_buffer, WINED3D_BIND_VERTEX_BUFFER); + if (!parameters->Windowed) { if (!focus_window)

1 0

Floris Renaud : inetcpl.cpl: Fix typo.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: f67f4bbadde3e7d297da6444d5cfadf26db543c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f67f4bbadde3e7d297da6444d5cfad… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Jul 12 13:42:02 2022 +0000 inetcpl.cpl: Fix typo. --- dlls/inetcpl.cpl/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/inetcpl.cpl/connections.c b/dlls/inetcpl.cpl/connections.c index c14002ea256..a6591051771 100644 --- a/dlls/inetcpl.cpl/connections.c +++ b/dlls/inetcpl.cpl/connections.c @@ -291,7 +291,7 @@ static INT_PTR connections_on_notify(HWND hwnd, WPARAM wparam, LPARAM lparam) RegCloseKey(hkey); return FALSE; } - TRACE("ProxtServer set to %s\n", wine_dbgstr_w(proxy)); + TRACE("ProxyServer set to %s\n", wine_dbgstr_w(proxy)); use_pac_script = IsDlgButtonChecked(hwnd, IDC_USE_PAC_SCRIPT); pac_script_len = GetDlgItemTextW(hwnd, IDC_EDIT_PAC_SCRIPT,

1 0

Rémi Bernon : mf: Use topology_node_get_type_handler in MFGetTopoNodeCurrentType.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 177046a137635a697830f23406d84b72b588784d URL: https://gitlab.winehq.org/wine/wine/-/commit/177046a137635a697830f23406d84b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:24:28 2022 +0200 mf: Use topology_node_get_type_handler in MFGetTopoNodeCurrentType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/topology.c | 59 +++++++++++++++++------------------------------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 29f34445bc5..e158ba1fc82 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1820,7 +1820,8 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } -static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) +static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, + BOOL output, IMFMediaTypeHandler **handler) { MF_TOPOLOGY_TYPE node_type; IMFStreamSink *stream_sink; @@ -1833,6 +1834,9 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: + if (output || stream) + return MF_E_INVALIDSTREAMNUMBER; + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); @@ -1840,6 +1844,9 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (!output || stream) + return MF_E_INVALIDSTREAMNUMBER; + if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, (void **)&sd))) { @@ -1860,10 +1867,8 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp */ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) { - IMFMediaTypeHandler *type_handler; + IMFMediaTypeHandler *handler; MF_TOPOLOGY_TYPE node_type; - IMFStreamSink *stream_sink; - IMFStreamDescriptor *sd; IMFTransform *transform; UINT32 primary_output; HRESULT hr; @@ -1873,42 +1878,15 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) return hr; - switch (node_type) + if (SUCCEEDED(hr = topology_node_get_type_handler(node, stream, output, &handler))) { - case MF_TOPOLOGY_OUTPUT_NODE: - if (output || stream) - return MF_E_INVALIDSTREAMNUMBER; - - if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); - IMFStreamSink_Release(stream_sink); - - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); - IMFMediaTypeHandler_Release(type_handler); - } - } - break; - case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (!output || stream) - return MF_E_INVALIDSTREAMNUMBER; - - if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, - (void **)&sd))) - { - return hr; - } + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + IMFMediaTypeHandler_Release(handler); + return hr; + } - hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &type_handler); - IMFStreamDescriptor_Release(sd); - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); - IMFMediaTypeHandler_Release(type_handler); - } - break; + switch (node_type) + { case MF_TOPOLOGY_TRANSFORM_NODE: if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { @@ -2291,10 +2269,9 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context TRACE("attempting to connect %p:%u to %p:%u\n", source, output_index, sink, input_index); - if (FAILED(hr = topology_node_get_type_handler(source, &source_handler))) + if (FAILED(hr = topology_node_get_type_handler(source, output_index, TRUE, &source_handler))) goto done; - - if (FAILED(hr = topology_node_get_type_handler(sink, &sink_handler))) + if (FAILED(hr = topology_node_get_type_handler(sink, input_index, FALSE, &sink_handler))) goto done; if (FAILED(IMFTopologyNode_GetUINT32(source, &MF_TOPONODE_CONNECT_METHOD, &source_method)))

1 0

Eric Pouech : dbghelp: Silence a couple of FIXMEs in SymGetTypeInfo().
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: bf68ec1f8a6b9ba0735e84e57ef06cbcf796aebd URL: https://gitlab.winehq.org/wine/wine/-/commit/bf68ec1f8a6b9ba0735e84e57ef06c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Silence a couple of FIXMEs in SymGetTypeInfo(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 0cbbc4e333b..170104bef86 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -945,7 +945,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(ULONG) = ((const struct symt_data*)type)->u.member.offset; break; default: - FIXME("Unknown kind (%u) for get-offset\n", + WARN("Unsupported kind (%u) for get-offset\n", ((const struct symt_data*)type)->kind); return FALSE; } @@ -957,6 +957,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case SymTagExe: case SymTagCompiland: case SymTagUDT: + case SymTagEnum: case SymTagFunctionType: case SymTagFunctionArgType: case SymTagPointerType:

1 0

Eric Pouech : mscvpdb.h: Use bitfield for defrange's variable flag.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 437e73883bd73eb219ba722b2fbba6398fc75343 URL: https://gitlab.winehq.org/wine/wine/-/commit/437e73883bd73eb219ba722b2fbba6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 mscvpdb.h: Use bitfield for defrange's variable flag. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 22 ++++++++++++++++++++-- tools/winedump/msc.c | 28 ++++++++++++++-------------- 3 files changed, 35 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ce2ad9b4e01..e34853b45e8 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2569,7 +2569,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_LOCAL: length += codeview_transform_defrange(msc_dbg, curr_func, sym, &loc); symt_add_func_local(msc_dbg->module, curr_func, - sym->local_v3.varflags & 0x0001 ? DataIsParam : DataIsLocal, + sym->local_v3.varflags.is_param ? DataIsParam : DataIsLocal, &loc, block, codeview_get_type(sym->local_v3.symtype, FALSE), sym->local_v3.name); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 8fb30d25cc6..994165463f3 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1374,6 +1374,24 @@ struct cv_addr_gap unsigned short cbRange; }; +struct cv_local_varflag +{ + unsigned short is_param : 1; + unsigned short address_taken : 1; + unsigned short from_compiler : 1; /* generated by compiler */ + unsigned short is_aggregate : 1; /* splitted in several variables by compiler */ + unsigned short from_aggregate : 1; /* marks a temporary from an aggregate */ + unsigned short is_aliased : 1; + unsigned short from_alias : 1; + unsigned short is_return_value : 1; + unsigned short optimized_out : 1; + unsigned short enreg_global : 1; /* global variable accessed from register */ + unsigned short enreg_static : 1; + + unsigned short unused : 5; + +}; + union codeview_symbol { struct @@ -1874,7 +1892,7 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t symtype; - unsigned short varflags; + struct cv_local_varflag varflags; char name[1]; } local_v3; @@ -2003,7 +2021,7 @@ union codeview_symbol unsigned short int id; cv_typ_t typind; unsigned int modOffset; - unsigned short varflags; + struct cv_local_varflag varflags; char name[1]; } file_static_v3; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 8c38dd1819e..85bbdfc3487 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -275,27 +275,27 @@ static const char* get_funcattr(unsigned attr) return tmp; } -static const char* get_varflags(unsigned flags) +static const char* get_varflags(struct cv_local_varflag flags) { static char tmp[1024]; unsigned pos = 0; - if (!flags) return "none"; #define X(s) {if (pos) tmp[pos++] = ';'; strcpy(tmp + pos, s); pos += strlen(s);} - if (flags & 0x0001) X("param"); - if (flags & 0x0002) X("addr-taken"); - if (flags & 0x0004) X("compiler-gen"); - if (flags & 0x0008) X("aggregated"); - if (flags & 0x0010) X("in-aggregate"); - if (flags & 0x0020) X("aliased"); - if (flags & 0x0040) X("alias"); - if (flags & 0x0080) X("retval"); - if (flags & 0x0100) X("optimized-out"); - if (flags & 0x0200) X("enreg-global"); - if (flags & 0x0400) X("enreg-static"); - if (flags & 0xf800) pos += sprintf(tmp, "unk:%x", flags & 0xf800); + if (flags.is_param) X("param"); + if (flags.address_taken) X("addr-taken"); + if (flags.from_compiler) X("compiler-gen"); + if (flags.is_aggregate) X("aggregated"); + if (flags.from_aggregate) X("in-aggregate"); + if (flags.is_aliased) X("aliased"); + if (flags.from_alias) X("alias"); + if (flags.is_return_value) X("retval"); + if (flags.optimized_out) X("optimized-out"); + if (flags.enreg_global) X("enreg-global"); + if (flags.enreg_static) X("enreg-static"); + if (flags.unused) pos += sprintf(tmp, "unk:%x", flags.unused); #undef X + if (!pos) return "none"; tmp[pos] = '\0'; assert(pos < sizeof(tmp));

1 0

Eric Pouech : dbghelp: Don't include global & static variables from S_LOCAL* records.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 87e2b007744f8bafdea63df21a74ffc24b392912 URL: https://gitlab.winehq.org/wine/wine/-/commit/87e2b007744f8bafdea63df21a74ff… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Don't include global & static variables from S_LOCAL* records. PDB supports description of a global or static variable: - accessed from a register - stored as a local variable record inside a function This likely describes access to a global/static variable where intermediate computation is kept in a register. We cannot store this kind of entries in local variable lists (builtin dbghelp and winedbg are not prepared to handle a global variable) Note: the global or static Codeview data record is still present (with a relocatable address), so the variable should still be available from global access (but could be not up-to-date if temporarly stored in a register). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index e34853b45e8..bec9dec2532 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1821,6 +1821,17 @@ static void codeview_xform_range(const struct msc_debug_info* msc_dbg, locinfo->rangelen = adrange->cbRange; } +static unsigned codeview_defrange_length(const union codeview_symbol* sym) +{ + const union codeview_symbol* first_symrange = get_next_sym(sym); + const union codeview_symbol* symrange; + + for (symrange = first_symrange; + symrange->generic.id >= S_DEFRANGE && symrange->generic.id <= S_DEFRANGE_REGISTER_REL; + symrange = get_next_sym(symrange)) {} + return (const char*)symrange - (const char*)first_symrange; +} + static unsigned codeview_transform_defrange(const struct msc_debug_info* msc_dbg, struct symt_function* curr_func, const union codeview_symbol* sym, @@ -2567,12 +2578,21 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, } break; case S_LOCAL: - length += codeview_transform_defrange(msc_dbg, curr_func, sym, &loc); - symt_add_func_local(msc_dbg->module, curr_func, - sym->local_v3.varflags.is_param ? DataIsParam : DataIsLocal, - &loc, block, - codeview_get_type(sym->local_v3.symtype, FALSE), - sym->local_v3.name); + /* FIXME: don't store global/static variables accessed through registers... we don't support that + * in locals... anyway, global data record should be present as well (so variable will be avaible + * through global defintion, but potentially not updated) + */ + if (!sym->local_v3.varflags.enreg_global && !sym->local_v3.varflags.enreg_static) + { + length += codeview_transform_defrange(msc_dbg, curr_func, sym, &loc); + symt_add_func_local(msc_dbg->module, curr_func, + sym->local_v3.varflags.is_param ? DataIsParam : DataIsLocal, + &loc, block, + codeview_get_type(sym->local_v3.symtype, FALSE), + sym->local_v3.name); + } + else + length += codeview_defrange_length(sym); break; case S_INLINESITE: {

1 0

Eric Pouech : dbghelp: Create lexical relationship between global vars and symt_module.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: d2a5f434c4fd03c61e96b10f1c3c9def70dcc9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/d2a5f434c4fd03c61e96b10f1c3c9d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Create lexical relationship between global vars and symt_module. Global (non static) variables are now stored in symt_module. (static variables are stored in symt_compiland). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/symbol.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index a81feb56b8d..4bf0bbae74a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -299,7 +299,7 @@ struct symt_data* symt_new_global_variable(struct module* module, sym->symt.tag = SymTagData; sym->hash_elt.name = pool_strdup(&module->pool, name); sym->kind = is_static ? DataIsFileStatic : DataIsGlobal; - sym->container = compiland ? &compiland->symt : NULL; + sym->container = compiland ? &compiland->symt : &module->top->symt; sym->type = type; sym->u.var = loc; if (type && size && symt_get_info(module, type, TI_GET_LENGTH, &tsz)) @@ -310,11 +310,8 @@ struct symt_data* symt_new_global_variable(struct module* module, wine_dbgstr_longlong(tsz), size); } symt_add_module_ht(module, (struct symt_ht*)sym); - if (compiland) - { - p = vector_add(&compiland->vchildren, &module->pool); - *p = &sym->symt; - } + p = vector_add(compiland ? &compiland->vchildren : &module->top->vchildren, &module->pool); + *p = &sym->symt; } return sym; }

1 0

Eric Pouech : dbghelp: Only reply to offset requests on symt_data in SymGetTypeInfo() for locals and parameters.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: a5c6cd5aefe40c0c104b26cbfeae9da1528f9b99 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5c6cd5aefe40c0c104b26cbfeae9d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Jul 12 09:28:57 2022 +0200 dbghelp: Only reply to offset requests on symt_data in SymGetTypeInfo() for locals and parameters. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/type.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 170104bef86..53ba85f9e77 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -939,7 +939,13 @@ BOOL symt_get_info(struct module* module, const struct symt* type, { case DataIsParam: case DataIsLocal: - X(ULONG) = ((const struct symt_data*)type)->u.var.offset; + { + struct location loc = ((const struct symt_data*)type)->u.var; + if (loc.kind == loc_register || loc.kind == loc_regrel) + X(ULONG) = ((const struct symt_data*)type)->u.var.offset; + else + return FALSE; /* FIXME perhaps do better with local context? */ + } break; case DataIsMember: X(ULONG) = ((const struct symt_data*)type)->u.member.offset;

1 0