wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Zebediah Figura : wined3d: Return the map pitch from wined3d_device_context_emit_map().
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: 4b7beecbeb247cb81953da960f160847bd5560fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b7beecbeb247cb81953da96… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 12 16:15:42 2021 -0500 wined3d: Return the map pitch from wined3d_device_context_emit_map(). Partially undoes 61024aa12f. We may want to be able to return an existing BO from context->ops->map_upload_bo(), in which case it is structurally awkward to request a specific memory layout. We may also want to give map_upload_bo() the freedom to allocate either a new (smaller) BO, or use an existing (larger) one, for partial uploads. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 29 ++++++++++++++++++++--------- dlls/wined3d/device.c | 5 +---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1b4ed519260..159b9ae05a9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2489,27 +2489,32 @@ static void wined3d_cs_exec_map(struct wined3d_cs *cs, const void *data) op->sub_resource_idx, op->map_ptr, op->box, op->flags); } -HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, struct wined3d_resource *resource, - unsigned int sub_resource_idx, void **map_ptr, const struct wined3d_box *box, unsigned int flags) +HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, + struct wined3d_resource *resource, unsigned int sub_resource_idx, + struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) { unsigned int row_pitch, slice_pitch; struct wined3d_cs_map *op; + void *map_ptr; HRESULT hr; + /* Mapping resources from the worker thread isn't an issue by itself, but + * increasing the map count would be visible to applications. */ + wined3d_not_from_cs(context->device->cs); + wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, &row_pitch, &slice_pitch); if ((flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) - && (*map_ptr = context->ops->map_upload_bo(context, resource, + && (map_ptr = context->ops->map_upload_bo(context, resource, sub_resource_idx, box, row_pitch, slice_pitch, flags))) { - TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", *map_ptr, row_pitch, slice_pitch); + TRACE("Returning map pointer %p, row pitch %u, slice pitch %u.\n", map_ptr, row_pitch, slice_pitch); + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; return WINED3D_OK; } - /* Mapping resources from the worker thread isn't an issue by itself, but - * increasing the map count would be visible to applications. */ - wined3d_not_from_cs(context->device->cs); - wined3d_resource_wait_idle(resource); if (!(op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_MAP))) @@ -2517,7 +2522,7 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, op->opcode = WINED3D_CS_OP_MAP; op->resource = resource; op->sub_resource_idx = sub_resource_idx; - op->map_ptr = map_ptr; + op->map_ptr = &map_ptr; op->box = box; op->flags = flags; op->hr = &hr; @@ -2525,6 +2530,12 @@ HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, wined3d_device_context_submit(context, WINED3D_CS_QUEUE_MAP); wined3d_device_context_finish(context, WINED3D_CS_QUEUE_MAP); + if (FAILED(hr)) + return hr; + + map_desc->data = map_ptr; + map_desc->row_pitch = row_pitch; + map_desc->slice_pitch = slice_pitch; return hr; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 436c4dfe854..b8c1630ee25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4957,10 +4957,7 @@ HRESULT CDECL wined3d_device_context_map(struct wined3d_device_context *context, } wined3d_mutex_lock(); - if (SUCCEEDED(hr = wined3d_device_context_emit_map(context, resource, - sub_resource_idx, &map_desc->data, box, flags))) - wined3d_resource_get_sub_resource_map_pitch(resource, sub_resource_idx, - &map_desc->row_pitch, &map_desc->slice_pitch); + hr = wined3d_device_context_emit_map(context, resource, sub_resource_idx, map_desc, box, flags); wined3d_mutex_unlock(); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56c90ba6606..a2899e6a778 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4867,7 +4867,7 @@ void wined3d_device_context_emit_execute_command_list(struct wined3d_device_cont void wined3d_device_context_emit_generate_mipmaps(struct wined3d_device_context *context, struct wined3d_shader_resource_view *view) DECLSPEC_HIDDEN; HRESULT wined3d_device_context_emit_map(struct wined3d_device_context *context, - struct wined3d_resource *resource, unsigned int sub_resource_idx, void **map_ptr, + struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN; void wined3d_device_context_emit_reset_state(struct wined3d_device_context *context, bool invalidate) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context *context,

1 0

Jan Sikorski : wined3d: Count all bo's towards retired bo size.
by Alexandre Julliard 14 Oct '21

14 Oct '21

Module: wine Branch: master Commit: b70a7f37bc44720c6b69b9323911b9b1e4b15c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b70a7f37bc44720c6b69b932… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Oct 12 15:49:27 2021 +0200 wined3d: Count all bo's towards retired bo size. Some memory may be counted more than once, as suballocations and as backing memory for these suballocations. It doesn't seem worth worrying about, since the threshold and the mechanism itself are heuristic. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 8f0751785ad..af7b9fc1830 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -901,6 +901,9 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const TRACE("context_vk %p, bo %p.\n", context_vk, bo); + if (bo->command_buffer_id == context_vk->current_command_buffer.id) + context_vk->retired_bo_size += bo->size; + if ((slab_vk = bo->slab)) { if (bo->map_ptr) @@ -923,9 +926,6 @@ void wined3d_context_vk_destroy_bo(struct wined3d_context_vk *context_vk, const if (bo->map_ptr) VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); wined3d_context_vk_destroy_vk_memory(context_vk, bo->vk_memory, bo->command_buffer_id); - - if (bo->command_buffer_id == context_vk->current_command_buffer.id) - context_vk->retired_bo_size += bo->size; } void wined3d_context_vk_poll_command_buffers(struct wined3d_context_vk *context_vk)

1 0

Rémi Bernon : hidparse.sys: Ignore unknown item types, rather than failing.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 6d307e2a647e71c21106feb0d62e371b3e55ab38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d307e2a647e71c21106feb0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Oct 12 10:00:25 2021 +0200 hidparse.sys: Ignore unknown item types, rather than failing. Some DS4 controllers have a trailing NUL byte when accessed over bluetooth. This causes parse_descriptor to return an error where we can instead ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 18ee23974f0..d455049d9b1 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -628,7 +628,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng default: FIXME( "item type %x not implemented!\n", *ptr ); - goto done; + break; } #undef SHORT_ITEM }

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.196.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: e5c8c615073c54ddea58ec3d4e1525c543332925 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c8c615073c54ddea58ec3d… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Wed Oct 13 16:19:35 2021 +0200 winevulkan: Update to VK spec version 1.2.196. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 18 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 623 +++++++++++++++++++++------------------- 4 files changed, 344 insertions(+), 301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c8c615073c54ddea58…

1 0

Hans Leidekker : wbemprox: Add __DERIVATION to the list of system properties.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 8b6565a61fe66ccd1472a4c78b3daf0e1897fba0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b6565a61fe66ccd1472a4c7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:45 2021 +0200 wbemprox: Add __DERIVATION to the list of system properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 28028474d59..63007565766 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1395,7 +1395,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0;

1 0

Hans Leidekker : wbemprox: Return an empty array for __DERIVATION.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 2243229043b9af45376e27df55a3fa279590a9b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2243229043b9af45376e27df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 13 12:48:44 2021 +0200 wbemprox: Return an empty array for __DERIVATION. Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 77ed27e105d..28028474d59 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1006,6 +1006,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 69bb8e7977e..5ca61cff825 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1642,6 +1642,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING );

1 0

Eric Pouech : dbghelp: Add helper to initialize a module_pair.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 099a8bbfd3b6cc0cb4508f999b11069beae43e38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=099a8bbfd3b6cc0cb4508f99… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:33 2021 +0200 dbghelp: Add helper to initialize a module_pair. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 5 +---- dlls/dbghelp/module.c | 7 +++++++ dlls/dbghelp/msc.c | 5 +---- dlls/dbghelp/symbol.c | 30 ++++++------------------------ dlls/dbghelp/type.c | 20 +++----------------- 6 files changed, 20 insertions(+), 49 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 14c4336e205..fda6714c332 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -629,6 +629,8 @@ extern const WCHAR S_WineLoaderW[] DECLSPEC_HIDDEN; extern const WCHAR S_SlashW[] DECLSPEC_HIDDEN; extern const struct loader_ops no_loader_ops DECLSPEC_HIDDEN; +extern BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, + DWORD64 addr) DECLSPEC_HIDDEN; extern struct module* module_find_by_addr(const struct process* pcs, DWORD64 addr, enum module_type type) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index c20c3db5ca9..f371f7a6822 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3652,10 +3652,7 @@ BOOL dwarf2_virtual_unwind(struct cpu_stack_walk *csw, ULONG_PTR ip, struct module_pair pair; struct frame_info info; - if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || - !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || - !module_get_debug(&pair)) - return FALSE; + if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE; if (!dwarf2_fetch_frame_info(pair.effective, csw->cpu, ip, &info)) return FALSE; /* if at very beginning of function, return and use default unwinder */ diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 254bbb297d7..488ed1a3bd6 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -262,6 +262,13 @@ struct module* module_new(struct process* pcs, const WCHAR* name, return module; } +BOOL module_init_pair(struct module_pair* pair, HANDLE hProcess, DWORD64 addr) +{ + if (!(pair->pcs = process_find_by_handle(hProcess))) return FALSE; + pair->requested = module_find_by_addr(pair->pcs, addr, DMT_UNKNOWN); + return module_get_debug(pair); +} + /*********************************************************************** * module_find_by_nameW * diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 353915cc7db..2468051acc7 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3199,10 +3199,7 @@ BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, char* strbase; BOOL ret = TRUE; - if (!(pair.pcs = process_find_by_handle(csw->hProcess)) || - !(pair.requested = module_find_by_addr(pair.pcs, ip, DMT_UNKNOWN)) || - !module_get_debug(&pair)) - return FALSE; + if (!module_init_pair(&pair, csw->hProcess, ip)) return FALSE; if (!pair.effective->format_info[DFI_PDB]) return FALSE; pdb_info = pair.effective->format_info[DFI_PDB]->u.pdb_info; TRACE("searching %lx => %lx\n", ip, ip - (DWORD_PTR)pair.effective->module.BaseOfImage); diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3fb6ba360fd..1113bbc39cf 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1363,10 +1363,7 @@ BOOL WINAPI SymFromAddr(HANDLE hProcess, DWORD64 Address, struct module_pair pair; struct symt_ht* sym; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, Address, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, Address)) return FALSE; if ((sym = symt_find_nearest(pair.effective, Address)) == NULL) return FALSE; symt_fill_sym_info(&pair, NULL, &sym->symt, Symbol); @@ -1717,10 +1714,7 @@ static BOOL get_line_from_addr(HANDLE hProcess, DWORD64 addr, struct symt_ht* symt; struct symt_function* func; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; if ((symt = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; if (symt->symt.tag != SymTagFunction) return FALSE; @@ -1862,10 +1856,7 @@ static BOOL symt_get_func_line_prev(HANDLE hProcess, struct internal_line_t* int struct line_info* li; struct line_info* srcli; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; if (key == NULL) return FALSE; @@ -1944,10 +1935,7 @@ static BOOL symt_get_func_line_next(HANDLE hProcess, struct internal_line_t* int struct line_info* srcli; if (key == NULL) return FALSE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, addr, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; /* search current source file */ for (srcli = key; !srcli->is_source_file; srcli--); @@ -2344,10 +2332,7 @@ BOOL WINAPI SymAddSymbol(HANDLE hProcess, ULONG64 BaseOfDll, PCSTR name, TRACE("(%p %s %s %u)\n", hProcess, wine_dbgstr_a(name), wine_dbgstr_longlong(addr), size); - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; return symt_new_custom(pair.effective, name, addr, size) != NULL; } @@ -2400,11 +2385,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (!cb) return FALSE; if (!(dbghelp_options & SYMOPT_LOAD_LINES)) return TRUE; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; + if (!module_init_pair(&pair, hProcess, base)) return FALSE; if (compiland) FIXME("Unsupported yet (filtering on compiland %s)\n", compiland); - pair.requested = module_find_by_addr(pair.pcs, base, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; if (!(srcmask = file_regex(srcfile))) return FALSE; sci.SizeOfStruct = sizeof(sci); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index e50c5cac1fd..eecb83f325f 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -483,9 +483,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, hProcess, wine_dbgstr_longlong(BaseOfDll), EnumSymbolsCallback, UserContext); - if (!(pair.pcs = process_find_by_handle(hProcess))) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; sym_info->SizeOfStruct = sizeof(SYMBOL_INFO); sym_info->MaxNameLen = sizeof(buffer) - sizeof(SYMBOL_INFO); @@ -1007,16 +1005,7 @@ BOOL WINAPI SymGetTypeInfo(HANDLE hProcess, DWORD64 ModBase, { struct module_pair pair; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - - pair.requested = module_find_by_addr(pair.pcs, ModBase, DMT_UNKNOWN); - if (!module_get_debug(&pair)) - { - FIXME("Someone didn't properly set ModBase (%s)\n", wine_dbgstr_longlong(ModBase)); - return FALSE; - } - + if (!module_init_pair(&pair, hProcess, ModBase)) return FALSE; return symt_get_info(pair.effective, symt_index2ptr(pair.effective, TypeId), GetType, pInfo); } @@ -1031,10 +1020,7 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, struct symt* type; DWORD64 size; - pair.pcs = process_find_by_handle(hProcess); - if (!pair.pcs) return FALSE; - pair.requested = module_find_by_addr(pair.pcs, BaseOfDll, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; Symbol->Index = Symbol->TypeIndex = symt_ptr2index(pair.effective, type);

1 0

Eric Pouech : dbghelp: Report a couple more VARIANT types in symbol info for constants.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: eded75f8d25dbf011ecbf5bcbae0352e2ca654b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eded75f8d25dbf011ecbf5bc… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:26 2021 +0200 dbghelp: Report a couple more VARIANT types in symbol info for constants. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 0b71584e6e0..3fb6ba360fd 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -750,13 +750,16 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Flags |= SYMFLAG_LOCAL; switch (V_VT(&data->u.value)) { - case VT_I4: sym_info->Value = (ULONG)V_I4(&data->u.value); break; - case VT_I2: sym_info->Value = (ULONG)(LONG_PTR)V_I2(&data->u.value); break; - case VT_I1: sym_info->Value = (ULONG)(LONG_PTR)V_I1(&data->u.value); break; - case VT_UI4: sym_info->Value = (ULONG)V_UI4(&data->u.value); break; - case VT_UI2: sym_info->Value = (ULONG)V_UI2(&data->u.value); break; - case VT_UI1: sym_info->Value = (ULONG)V_UI1(&data->u.value); break; - case VT_BYREF: sym_info->Value = (ULONG64)(DWORD_PTR)V_BYREF(&data->u.value); break; + case VT_I8: sym_info->Value = (LONG64)V_I8(&data->u.value); break; + case VT_I4: sym_info->Value = (LONG64)V_I4(&data->u.value); break; + case VT_I2: sym_info->Value = (LONG64)V_I2(&data->u.value); break; + case VT_I1: sym_info->Value = (LONG64)V_I1(&data->u.value); break; + case VT_UINT:sym_info->Value = V_UINT(&data->u.value); break; + case VT_UI8: sym_info->Value = V_UI8(&data->u.value); break; + case VT_UI4: sym_info->Value = V_UI4(&data->u.value); break; + case VT_UI2: sym_info->Value = V_UI2(&data->u.value); break; + case VT_UI1: sym_info->Value = V_UI1(&data->u.value); break; + case VT_BYREF: sym_info->Value = (DWORD_PTR)V_BYREF(&data->u.value); break; case VT_EMPTY: sym_info->Value = 0; break; default: FIXME("Unsupported variant type (%u)\n", V_VT(&data->u.value));

1 0

Eric Pouech : dbghelp: Use proper macros for VARIANT.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 58d5b3c880ce9d3f0d5f9d193dba250014676144 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58d5b3c880ce9d3f0d5f9d19… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:20 2021 +0200 dbghelp: Use proper macros for VARIANT. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 32 ++++++++++++++--------------- dlls/dbghelp/msc.c | 57 +++++++++++++++++++++++++-------------------------- dlls/dbghelp/symbol.c | 18 ++++++++-------- dlls/dbghelp/type.c | 8 ++++---- 4 files changed, 57 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58d5b3c880ce9d3f0d5f…

1 0

Eric Pouech : winedump: Dump MSC's S_UNAMESPACE entries.
by Alexandre Julliard 13 Oct '21

13 Oct '21

Module: wine Branch: master Commit: 768bb93fd78fc4cafd01443989e5cec75a9adaaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=768bb93fd78fc4cafd014439… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Oct 13 15:17:14 2021 +0200 winedump: Dump MSC's S_UNAMESPACE entries. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 15 +++++++++++++++ tools/winedump/msc.c | 8 ++++++++ 2 files changed, 23 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c9ab4abb166..1ede937abc4 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1958,6 +1958,20 @@ union codeview_symbol unsigned short varflags; char name[1]; } file_static_v3; + + struct + { + unsigned short int len; + unsigned short int id; + struct p_string pname; + } unamespace_v2; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned char name[1]; + } unamespace_v3; }; enum BinaryAnnotationOpcode @@ -2031,6 +2045,7 @@ enum BinaryAnnotationOpcode #define S_GTHREAD32_ST 0x100f #define S_FRAMEPROC 0x1012 #define S_COMPILE2_ST 0x1013 +#define S_UNAMESPACE_ST 0x1029 #define S_OBJNAME 0x1101 #define S_THUNK32 0x1102 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index b7b7eb435ff..12d1a9e62ab 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1839,6 +1839,14 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) get_varflags(sym->file_static_v3.varflags)); break; + case S_UNAMESPACE_ST: + printf("UNameSpace V2 '%s'\n", p_string(&sym->unamespace_v2.pname)); + break; + + case S_UNAMESPACE: + printf("UNameSpace V3 '%s'\n", sym->unamespace_v3.name); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021