October 2021 - Wine-commits

Rémi Bernon : dinput: Implement SetProperty DIPROP_APPDATA using enum_objects.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 998b9d86661450e2fe4db03b68e930297e18964c URL: https://source.winehq.org/git/wine.git/?a=commit;h=998b9d86661450e2fe4db03b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 28 10:12:33 2021 +0200 dinput: Implement SetProperty DIPROP_APPDATA using enum_objects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 36 +++++++++--------------------------- dlls/dinput8/tests/hid.c | 1 - 2 files changed, 9 insertions(+), 28 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 52a6e14ab8d..5e3e54e5754 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -580,22 +580,6 @@ failed: return DIERR_OUTOFMEMORY; } -static int verify_offset(const DataFormat *df, int offset) -{ - int i; - - if (!df->offsets) - return -1; - - for (i = df->wine_df->dwNumObjs - 1; i >= 0; i--) - { - if (df->offsets[i] == offset) - return offset; - } - - return -1; -} - static int id_to_object( LPCDIDATAFORMAT df, int id ) { int i; @@ -1320,6 +1304,8 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co { struct set_object_property_params params = {.iface = iface, .header = header, .property = LOWORD( guid )}; struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); + DWORD object_mask = DIDFT_AXIS | DIDFT_BUTTON | DIDFT_POV; + DIDEVICEOBJECTINSTANCEW instance; DIPROPHEADER filter; HRESULT hr; @@ -1421,18 +1407,14 @@ static HRESULT WINAPI dinput_device_SetProperty( IDirectInputDevice8W *iface, co case (DWORD_PTR)DIPROP_APPDATA: { const DIPROPPOINTER *value = (const DIPROPPOINTER *)header; - int offset = -1; + int user_offset; if (header->dwSize != sizeof(DIPROPPOINTER)) return DIERR_INVALIDPARAM; - - if (header->dwHow == DIPH_BYID) - offset = id_to_offset( &impl->data_format, header->dwObj ); - else if (header->dwHow == DIPH_BYOFFSET) - offset = verify_offset( &impl->data_format, header->dwObj ); - else - return DIERR_UNSUPPORTED; - - if (offset == -1) return DIERR_OBJECTNOTFOUND; - if (!set_app_data( impl, offset, value->uData )) return DIERR_OUTOFMEMORY; + if (header->dwHow == DIPH_DEVICE) return DIERR_UNSUPPORTED; + hr = impl->vtbl->enum_objects( iface, &filter, object_mask, find_object, &instance ); + if (FAILED(hr)) return hr; + if (hr == DIENUM_CONTINUE) return DIERR_OBJECTNOTFOUND; + if ((user_offset = id_to_offset( &impl->data_format, instance.dwType )) < 0) return DIERR_OBJECTNOTFOUND; + if (!set_app_data( impl, user_offset, value->uData )) return DIERR_OUTOFMEMORY; return DI_OK; } default: diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 526e191ea41..2f2efbe09e3 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4794,7 +4794,6 @@ static void test_simple_joystick(void) prop_pointer.diph.dwObj = MAKELONG( HID_USAGE_GENERIC_X, HID_USAGE_PAGE_GENERIC ); prop_pointer.uData = 0xfeedcafe; hr = IDirectInputDevice8_SetProperty( device, DIPROP_APPDATA, &prop_pointer.diph ); - todo_wine ok( hr == DI_OK, "SetProperty DIPROP_APPDATA returned %#x\n", hr ); prop_dword.dwData = 0xdeadbeef;

1 0

Rémi Bernon : dinput: Always use the data format transform.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: f82cce060d9413f8b4f290228fe0916e77a8fd98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f82cce060d9413f8b4f29022… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 28 10:12:34 2021 +0200 dinput: Always use the data format transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 20 ++------------------ dlls/dinput/device_private.h | 1 - 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5e3e54e5754..6601d705462 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -342,10 +342,6 @@ static void fill_DataFormat( void *out, DWORD size, const void *in, const DataFo char *out_c = out; memset(out, 0, size); - if (df->dt == NULL) { - /* This means that the app uses Wine's internal data format */ - memcpy(out, in, min(size, df->internal_format_size)); - } else { for (i = 0; i < df->size; i++) { if (df->dt[i].offset_in >= 0) { switch (df->dt[i].size) { @@ -396,7 +392,6 @@ static void fill_DataFormat( void *out, DWORD size, const void *in, const DataFo break; } } - } } } @@ -444,7 +439,6 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const DataFormat *format = &impl->data_format; DataTransform *dt; unsigned int i, j; - int same = 1; int *done; int index = 0; DWORD next = 0; @@ -517,11 +511,8 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const format->offsets[i] = asked_format->rgodf[j].dwOfs; dt[index].value = 0; next = next + dt[index].size; - - if (format->wine_df->rgodf[i].dwOfs != dt[index].offset_out) - same = 0; - - index++; + + index++; break; } } @@ -540,8 +531,6 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const TRACE(" * dwFlags: 0x%08x\n", asked_format->rgodf[j].dwFlags); TRACE(" "); _dump_ObjectDataFormat_flags(asked_format->rgodf[j].dwFlags); TRACE("\n"); - same = 0; - if (!(asked_format->rgodf[j].dwType & DIDFT_POV)) continue; /* fill_DataFormat memsets the buffer to 0 */ @@ -556,12 +545,7 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const } } - format->internal_format_size = format->wine_df->dwDataSize; format->size = index; - if (same) { - free( dt ); - dt = NULL; - } format->dt = dt; free( done ); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 4420f59cc6d..1b81a374058 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -39,7 +39,6 @@ typedef struct typedef struct { int size; - int internal_format_size; DataTransform *dt; int *offsets; /* object offsets */

1 0

Rémi Bernon : mfreadwrite/reader: Add recognition of ftypeMSNV mp4 header.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: ff0a13c86e7307803371b657d9067e1f55d5f7fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff0a13c86e7307803371b657… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 27 17:04:14 2021 +0200 mfreadwrite/reader: Add recognition of ftypeMSNV mp4 header. Needed by Greedfall intro videos. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index d26778dad36..7bcb52eaaa6 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -2395,6 +2395,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) static const unsigned char wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; static const unsigned char wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const unsigned char isommagic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'i', 's', 'o', 'm',0x00,0x00,0x00,0x00}; + static const unsigned char mp4_magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'M', 'S', 'N', 'V',0x00,0x00,0x00,0x00}; static const unsigned char mp42magic[] = {0x00,0x00,0x00,0x00, 'f', 't', 'y', 'p', 'm', 'p', '4', '2',0x00,0x00,0x00,0x00}; static const unsigned char mp4mask[] = {0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00}; static const struct stream_content_url_hint @@ -2409,6 +2410,7 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { wavmagic, L".wav", wavmask }, { isommagic, L".mp4", mp4mask }, { mp42magic, L".mp4", mp4mask }, + { mp4_magic, L".mp4", mp4mask }, }; unsigned char buffer[4 * sizeof(unsigned int)], pattern[4 * sizeof(unsigned int)]; unsigned int i, j, length = 0, caps = 0;

1 0

Andrew Eikum : mf/session: Forward MR_STREAM_VOLUME_SERVICE requests to SAR node.
by Alexandre Julliard 28 Oct '21

28 Oct '21

Module: wine Branch: master Commit: 43993feb2ca43969d392bc48daa42ee026f9feee URL: https://source.winehq.org/git/wine.git/?a=commit;h=43993feb2ca43969d392bc48… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 28 17:33:01 2021 +0300 mf/session: Forward MR_STREAM_VOLUME_SERVICE requests to SAR node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 0377b19c51f..e3d77864494 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2080,7 +2080,8 @@ static HRESULT WINAPI session_get_service_GetService(IMFGetService *iface, REFGU { hr = session_get_video_render_service(session, service, riid, obj); } - else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE)) + else if (IsEqualGUID(service, &MR_POLICY_VOLUME_SERVICE) || + IsEqualGUID(service, &MR_STREAM_VOLUME_SERVICE)) { hr = session_get_audio_render_service(session, service, riid, obj); }

1 0

Eric Pouech : dbghelp: Implement SymFromInlineContext() when context isn't in inline mode.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 219e4b6e75618e9e2d1dc399d71544c4fb4f0035 URL: https://source.winehq.org/git/wine.git/?a=commit;h=219e4b6e75618e9e2d1dc399… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:20 2021 +0200 dbghelp: Implement SymFromInlineContext() when context isn't in inline mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 21 +++++++++++++++++++++ dlls/dbghelp/symbol.c | 15 ++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 2ebe6699a1d..6217701a457 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -845,3 +845,24 @@ extern struct symt_pointer* extern struct symt_typedef* symt_new_typedef(struct module* module, struct symt* ref, const char* name) DECLSPEC_HIDDEN; + +/* Inline context encoding (different from what native does): + * bits 31:30: 3 ignore (includes INLINE_FRAME_CONTEXT_IGNORE=0xFFFFFFFF) + * 2 regular frame + * 1 frame with inlined function(s). + * 0 init (includes INLINE_FRAME_CONTEXT_INIT=0) + * so either stackwalkex is called with: + * - inlinectx=IGNORE, and we use (old) StackWalk64 behavior: + * - inlinectx=INIT, and StackWalkEx will upon return swing back&forth between: + * INLINE when the frame is from an inline site (inside a function) + * REGULAR when the frame is for a function without inline site + * bits 29:00 depth of inline site (way too big!!) + * 0 being the lowest inline site + */ +#define IFC_MODE_IGNORE 0xC0000000 +#define IFC_MODE_REGULAR 0x80000000 +#define IFC_MODE_INLINE 0x40000000 +#define IFC_MODE_INIT 0x00000000 +#define IFC_DEPTH_MASK 0x3FFFFFFF +#define IFC_MODE(x) ((x) & ~IFC_DEPTH_MASK) +#define IFC_DEPTH(x) ((x) & IFC_DEPTH_MASK) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 19374999070..21616627af9 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2497,9 +2497,18 @@ PWSTR WINAPI SymSetHomeDirectoryW(HANDLE hProcess, PCWSTR dir) */ BOOL WINAPI SymFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, PDWORD64 disp, PSYMBOL_INFO si) { - FIXME("(%p, %#I64x, 0x%x, %p, %p): stub\n", hProcess, addr, inline_ctx, disp, si); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + TRACE("(%p, %#I64x, 0x%x, %p, %p)\n", hProcess, addr, inline_ctx, disp, si); + + switch (IFC_MODE(inline_ctx)) + { + case IFC_MODE_IGNORE: + case IFC_MODE_REGULAR: + return SymFromAddr(hProcess, addr, disp, si); + case IFC_MODE_INLINE: + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } } /******************************************************************

1 0

Eric Pouech : dbghelp: Implement SymGetLineFromInlineContext*() when context isn't in inline mode.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: e250c6fb98c360e7e310dde251e166fdd39bcc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e250c6fb98c360e7e310dde2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:26 2021 +0200 dbghelp: Implement SymGetLineFromInlineContext*() when context isn't in inline mode. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 21616627af9..82c69b2e848 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2537,16 +2537,37 @@ BOOL WINAPI SymFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ct return ret; } +static BOOL get_line_from_inline_context(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, + struct internal_line_t* intl) +{ + switch (IFC_MODE(inline_ctx)) + { + case IFC_MODE_INLINE: + case IFC_MODE_IGNORE: + case IFC_MODE_REGULAR: + return get_line_from_addr(hProcess, addr, disp, intl); + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } +} + /****************************************************************** * SymGetLineFromInlineContext (DBGHELP.@) * */ BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINE64 line) { - FIXME("(%p, %#I64x, 0x%x, %#I64x, %p, %p): stub!\n", + struct internal_line_t intl; + + TRACE("(%p, %#I64x, 0x%x, %#I64x, %p, %p)\n", hProcess, addr, inline_ctx, mod_addr, disp, line); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (line->SizeOfStruct < sizeof(*line)) return FALSE; + init_internal_line(&intl, FALSE); + + if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE; + return internal_line_copy_toA64(&intl, line); } /****************************************************************** @@ -2555,8 +2576,14 @@ BOOL WINAPI SymGetLineFromInlineContext(HANDLE hProcess, DWORD64 addr, ULONG inl */ BOOL WINAPI SymGetLineFromInlineContextW(HANDLE hProcess, DWORD64 addr, ULONG inline_ctx, DWORD64 mod_addr, PDWORD disp, PIMAGEHLP_LINEW64 line) { - FIXME("(%p, %#I64x, 0x%x, %#I64x, %p, %p): stub!\n", + struct internal_line_t intl; + + TRACE("(%p, %#I64x, 0x%x, %#I64x, %p, %p)\n", hProcess, addr, inline_ctx, mod_addr, disp, line); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (line->SizeOfStruct < sizeof(*line)) return FALSE; + init_internal_line(&intl, TRUE); + + if (!get_line_from_inline_context(hProcess, addr, inline_ctx, mod_addr, disp, &intl)) return FALSE; + return internal_line_copy_toW64(&intl, line); }

1 0

Eric Pouech : dbghelp: Add local scope information in struct process.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 066bb761cc17a585daa97f1524231cbd972fc4f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=066bb761cc17a585daa97f15… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:32 2021 +0200 dbghelp: Add local scope information in struct process. - make SymSetContext() generate this information - let SymEnumSymboli() (when dealing with local symbols) use this information instead of the stack frame Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 14 ++++++++++++-- dlls/dbghelp/dbghelp_private.h | 2 ++ dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/module.c | 10 +++++++++- dlls/dbghelp/symbol.c | 14 ++++++-------- 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 00f02423fef..64ceb447ee9 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -606,11 +606,21 @@ BOOL WINAPI SymSetParentWindow(HWND hwnd) BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, PIMAGEHLP_CONTEXT Context) { - struct process* pcs = process_find_by_handle(hProcess); + struct process* pcs; + struct module_pair pair; + struct symt_ht* sym; + + pair.pcs = pcs = process_find_by_handle(hProcess); if (!pcs) return FALSE; - if (!module_find_by_addr(pcs, StackFrame->InstructionOffset, DMT_UNKNOWN)) + pair.requested = module_find_by_addr(pair.pcs, StackFrame->InstructionOffset, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; return FALSE; + if ((sym = symt_find_nearest(pair.effective, StackFrame->InstructionOffset)) == NULL) return FALSE; + if (sym->symt.tag != SymTagFunction) return FALSE; + pcs->localscope_pc = StackFrame->InstructionOffset; + pcs->localscope_symt = &sym->symt; + if (pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && pcs->ctx_frame.StackOffset == StackFrame->StackOffset) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 6217701a457..7ab7d1b7fc3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -438,6 +438,8 @@ struct process ULONG_PTR dbg_hdr_addr; IMAGEHLP_STACK_FRAME ctx_frame; + DWORD64 localscope_pc; + struct symt* localscope_symt; unsigned buffer_size; void* buffer; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e1c77569622..c503be4dcc1 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -3723,7 +3723,7 @@ static void dwarf2_location_compute(struct process* pcs, else { /* instruction pointer relative to compiland's start */ - ip = pcs->ctx_frame.InstructionOffset - ((struct symt_compiland*)func->container)->address; + ip = pcs->localscope_pc - ((struct symt_compiland*)func->container)->address; if ((err = loc_compute_frame(pcs, modfmt, func, ip, head, &frame)) == 0) { diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index f0fd2a55016..8168e727c52 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -1048,7 +1048,15 @@ BOOL WINAPI SymUnloadModule64(HANDLE hProcess, DWORD64 BaseOfDll) if (!pcs) return FALSE; module = module_find_by_addr(pcs, BaseOfDll, DMT_UNKNOWN); if (!module) return FALSE; - return module_remove(pcs, module); + if (!module_remove(pcs, module)) return FALSE; + /* remove local scope if defined inside this module */ + if (pcs->localscope_pc >= module->module.BaseOfImage && + pcs->localscope_pc < module->module.BaseOfImage + module->module.ImageSize) + { + pcs->localscope_pc = 0; + pcs->localscope_symt = NULL; + } + return TRUE; } /****************************************************************** diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 82c69b2e848..0f53bcd023c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1028,7 +1028,7 @@ static BOOL symt_enum_locals_helper(struct module_pair* pair, struct symt_function* func, const struct vector* v) { struct symt* lsym = NULL; - DWORD_PTR pc = pair->pcs->ctx_frame.InstructionOffset; + DWORD_PTR pc = pair->pcs->localscope_pc; unsigned int i; WCHAR* nameW; BOOL ret; @@ -1074,21 +1074,19 @@ static BOOL symt_enum_locals(struct process* pcs, const WCHAR* mask, const struct sym_enum* se) { struct module_pair pair; - struct symt_ht* sym; - DWORD_PTR pc = pcs->ctx_frame.InstructionOffset; se->sym_info->SizeOfStruct = sizeof(*se->sym_info); se->sym_info->MaxNameLen = sizeof(se->buffer) - sizeof(SYMBOL_INFO); pair.pcs = pcs; - pair.requested = module_find_by_addr(pair.pcs, pc, DMT_UNKNOWN); + pair.requested = module_find_by_addr(pair.pcs, pcs->localscope_pc, DMT_UNKNOWN); if (!module_get_debug(&pair)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, pc)) == NULL) return FALSE; - if (sym->symt.tag == SymTagFunction) + if (symt_check_tag(pcs->localscope_symt, SymTagFunction) || + symt_check_tag(pcs->localscope_symt, SymTagInlineSite)) { - return symt_enum_locals_helper(&pair, mask ? mask : L"*", se, (struct symt_function*)sym, - &((struct symt_function*)sym)->vchildren); + struct symt_function* func = (struct symt_function*)pcs->localscope_symt; + return symt_enum_locals_helper(&pair, mask ? mask : L"*", se, func, &func->vchildren); } return FALSE; }

1 0

Eric Pouech : dbghelp: Implement SymSetScopeFromAddr() and SymSetScopeFromIndex().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 925182b09f54239db7fcc41ddb0bf9377bbe9c8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=925182b09f54239db7fcc41d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:38 2021 +0200 dbghelp: Implement SymSetScopeFromAddr() and SymSetScopeFromIndex(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 64ceb447ee9..81a43327708 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -644,11 +644,18 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, */ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) { - struct process* pcs; + struct module_pair pair; + struct symt_ht* sym; - FIXME("(%p %#I64x): stub\n", hProcess, addr); + TRACE("(%p %#I64x)\n", hProcess, addr); + + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; + if ((sym = symt_find_nearest(pair.effective, addr)) == NULL) return FALSE; + if (sym->symt.tag != SymTagFunction) return FALSE; + + pair.pcs->localscope_pc = addr; + pair.pcs->localscope_symt = &sym->symt; - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; return TRUE; } @@ -657,11 +664,18 @@ BOOL WINAPI SymSetScopeFromAddr(HANDLE hProcess, ULONG64 addr) */ BOOL WINAPI SymSetScopeFromIndex(HANDLE hProcess, ULONG64 addr, DWORD index) { - struct process* pcs; + struct module_pair pair; + struct symt* sym; - FIXME("(%p %#I64x %u): stub\n", hProcess, addr, index); + TRACE("(%p %#I64x %u)\n", hProcess, addr, index); + + if (!module_init_pair(&pair, hProcess, addr)) return FALSE; + sym = symt_index2ptr(pair.effective, index); + if (!symt_check_tag(sym, SymTagFunction)) return FALSE; + + pair.pcs->localscope_pc = ((struct symt_function*)sym)->address; /* FIXME of FuncDebugStart when it exists? */ + pair.pcs->localscope_symt = sym; - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; return TRUE; }

1 0

Eric Pouech : dbghelp: Rewrite SymSetContext() on top of SymSetScopeFromAddr().
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 706c5400e95b3ff851c5bb38c408127820464dec URL: https://source.winehq.org/git/wine.git/?a=commit;h=706c5400e95b3ff851c5bb38… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:44 2021 +0200 dbghelp: Rewrite SymSetContext() on top of SymSetScopeFromAddr(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index 81a43327708..eb0977dff36 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -607,34 +607,27 @@ BOOL WINAPI SymSetContext(HANDLE hProcess, PIMAGEHLP_STACK_FRAME StackFrame, PIMAGEHLP_CONTEXT Context) { struct process* pcs; - struct module_pair pair; - struct symt_ht* sym; + BOOL same; - pair.pcs = pcs = process_find_by_handle(hProcess); - if (!pcs) return FALSE; + if (!(pcs = process_find_by_handle(hProcess))) return FALSE; + same = pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && + pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && + pcs->ctx_frame.StackOffset == StackFrame->StackOffset; - pair.requested = module_find_by_addr(pair.pcs, StackFrame->InstructionOffset, DMT_UNKNOWN); - if (!module_get_debug(&pair)) return FALSE; + if (!SymSetScopeFromAddr(hProcess, StackFrame->InstructionOffset)) return FALSE; - if ((sym = symt_find_nearest(pair.effective, StackFrame->InstructionOffset)) == NULL) return FALSE; - if (sym->symt.tag != SymTagFunction) return FALSE; - pcs->localscope_pc = StackFrame->InstructionOffset; - pcs->localscope_symt = &sym->symt; - if (pcs->ctx_frame.ReturnOffset == StackFrame->ReturnOffset && - pcs->ctx_frame.FrameOffset == StackFrame->FrameOffset && - pcs->ctx_frame.StackOffset == StackFrame->StackOffset) + pcs->ctx_frame = *StackFrame; + if (same) { TRACE("Setting same frame {rtn=%I64x frm=%I64x stk=%I64x}\n", pcs->ctx_frame.ReturnOffset, pcs->ctx_frame.FrameOffset, pcs->ctx_frame.StackOffset); - pcs->ctx_frame.InstructionOffset = StackFrame->InstructionOffset; SetLastError(ERROR_SUCCESS); return FALSE; } - pcs->ctx_frame = *StackFrame; /* Context is not (no longer?) used */ return TRUE; }

1 0

Eric Pouech : dbghelp: Implement SymSetScopeFromInlineContext() when context isn't inlined.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 8592e9088fc4af8045ebaac13aea75ae96d0289f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8592e9088fc4af8045ebaac1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:50 2021 +0200 dbghelp: Implement SymSetScopeFromInlineContext() when context isn't inlined. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index eb0977dff36..0b1e20e93c0 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -677,12 +677,17 @@ BOOL WINAPI SymSetScopeFromIndex(HANDLE hProcess, ULONG64 addr, DWORD index) */ BOOL WINAPI SymSetScopeFromInlineContext(HANDLE hProcess, ULONG64 addr, DWORD inlinectx) { - struct process* pcs; - - FIXME("(%p %#I64x %u): stub\n", hProcess, addr, inlinectx); + TRACE("(%p %I64x %x)\n", hProcess, addr, inlinectx); - if (!(pcs = process_find_by_handle(hProcess))) return FALSE; - return TRUE; + switch (IFC_MODE(inlinectx)) + { + case IFC_MODE_IGNORE: + case IFC_MODE_REGULAR: return SymSetScopeFromAddr(hProcess, addr); + case IFC_MODE_INLINE: + default: + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } } /******************************************************************

1 0