November 2021 - Wine-Commits

Zhiyi Zhang : comctl32/button: Support BS_PUSHLIKE for themed command links.
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: ce9d006a4511f36aeab4c0205c23725d0e03e730 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce9d006a4511f36aeab4c020… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:04:26 2021 +0800 comctl32/button: Support BS_PUSHLIKE for themed command links. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f158a7423b9..2e3d8912a66 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -3040,6 +3040,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; + int part; RECT rc; if (infoPtr->font) SelectObject(hDC, infoPtr->font); @@ -3054,9 +3055,10 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); if (cdrf & CDRF_SKIPDEFAULT) return; - if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) + part = GetWindowLongW(infoPtr->hwnd, GWL_STYLE) & BS_PUSHLIKE ? BP_PUSHBUTTON : BP_COMMANDLINK; + if (IsThemeBackgroundPartiallyTransparent(theme, part, state)) DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); - DrawThemeBackground(theme, hDC, BP_COMMANDLINK, state, &rc, NULL); + DrawThemeBackground(theme, hDC, part, state, &rc, NULL); if (cdrf & CDRF_NOTIFYPOSTERASE) { @@ -3076,7 +3078,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in SIZE img_size; WCHAR *text; - GetThemeBackgroundContentRect(theme, hDC, BP_COMMANDLINK, state, &rc, &r); + GetThemeBackgroundContentRect(theme, hDC, part, state, &rc, &r); /* The text alignment and styles are fixed and don't depend on button styles */ dtFlags = DT_TOP | DT_LEFT | DT_WORDBREAK; @@ -3096,10 +3098,9 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in UINT len = lstrlenW(text); RECT text_rect; - GetThemeTextExtent(theme, hDC, BP_COMMANDLINK, state, text, len, - dtFlags | DT_END_ELLIPSIS, &r, &text_rect); - DrawThemeText(theme, hDC, BP_COMMANDLINK, state, text, len, - dtFlags | DT_END_ELLIPSIS, 0, &r); + GetThemeTextExtent(theme, hDC, part, state, text, len, dtFlags | DT_END_ELLIPSIS, &r, + &text_rect); + DrawThemeText(theme, hDC, part, state, text, len, dtFlags | DT_END_ELLIPSIS, 0, &r); txt_h = text_rect.bottom - text_rect.top; heap_free(text); @@ -3114,8 +3115,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in opts.dwSize = sizeof(opts); opts.dwFlags = DTT_FONTPROP; opts.iFontPropId = TMT_BODYFONT; - DrawThemeTextEx(theme, hDC, BP_COMMANDLINK, state, - infoPtr->note, infoPtr->note_length, + DrawThemeTextEx(theme, hDC, part, state, infoPtr->note, infoPtr->note_length, dtFlags | DT_NOPREFIX, &r, &opts); }

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetAllocateForOutput().
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: 2f7e7d284bddd27d98a17beca4da0b6525d72913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f7e7d284bddd27d98a17bec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:46 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetAllocateForOutput(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 8 +++- dlls/winegstreamer/wm_asyncreader.c | 17 ++++++-- dlls/winegstreamer/wm_reader.c | 84 +++++++++++++++++++++++++++++++------ 3 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index e1dec7b755c..f1862515ebc 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -120,10 +120,11 @@ struct wm_stream { struct wm_reader *reader; struct wg_parser_stream *wg_stream; - WORD index; - bool eos; struct wg_format format; WMT_STREAM_SELECTION selection; + WORD index; + bool eos; + bool allocate_output; }; struct wm_reader @@ -148,6 +149,8 @@ struct wm_reader struct wm_stream *streams; WORD stream_count; + IWMReaderCallbackAdvanced *callback_advanced; + const struct wm_reader_ops *ops; }; @@ -174,6 +177,7 @@ void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops); HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename); HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream); void wm_reader_seek(struct wm_reader *reader, QWORD start, LONGLONG duration); +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate); HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, IWMOutputMediaProps *props); HRESULT wm_reader_set_streams_selected(struct wm_reader *reader, WORD count, diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c index 35ed8221aa0..e0547dfda60 100644 --- a/dlls/winegstreamer/wm_asyncreader.c +++ b/dlls/winegstreamer/wm_asyncreader.c @@ -57,10 +57,16 @@ static REFERENCE_TIME get_current_time(const struct async_reader *reader) static void open_stream(struct async_reader *reader, IWMReaderCallback *callback, void *context) { static const DWORD zero; + HRESULT hr; IWMReaderCallback_AddRef(reader->callback = callback); reader->context = context; IWMReaderCallback_OnStatus(callback, WMT_OPENED, S_OK, WMT_TYPE_DWORD, (BYTE *)&zero, context); + + if (FAILED(hr = IWMReaderCallback_QueryInterface(callback, + &IID_IWMReaderCallbackAdvanced, (void **)&reader->reader.callback_advanced))) + reader->reader.callback_advanced = NULL; + TRACE("Querying for IWMReaderCallbackAdvanced returned %#x.\n", hr); } static DWORD WINAPI stream_thread(void *arg) @@ -497,11 +503,14 @@ static HRESULT WINAPI WMReaderAdvanced_GetReceiveStreamSamples(IWMReaderAdvanced return E_NOTIMPL; } -static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL allocate) +static HRESULT WINAPI WMReaderAdvanced_SetAllocateForOutput(IWMReaderAdvanced6 *iface, + DWORD output, BOOL allocate) { - struct async_reader *This = impl_from_IWMReaderAdvanced6(iface); - FIXME("(%p)->(%d %x)\n", This, output_num, allocate); - return E_NOTIMPL; + struct async_reader *reader = impl_from_IWMReaderAdvanced6(iface); + + TRACE("reader %p, output %u, allocate %d.\n", reader, output, allocate); + + return wm_reader_set_allocate_for_output(&reader->reader, output, allocate); } static HRESULT WINAPI WMReaderAdvanced_GetAllocateForOutput(IWMReaderAdvanced6 *iface, DWORD output_num, BOOL *allocate) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 0e0c639d504..810a800f016 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -1532,6 +1532,10 @@ HRESULT wm_reader_close(struct wm_reader *reader) CloseHandle(reader->read_thread); reader->read_thread = NULL; + if (reader->callback_advanced) + IWMReaderCallbackAdvanced_Release(reader->callback_advanced); + reader->callback_advanced = NULL; + wg_parser_destroy(reader->wg_parser); reader->wg_parser = NULL; @@ -1736,9 +1740,9 @@ static const char *get_major_type_string(enum wg_major_type type) HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, INSSBuffer **ret_sample, QWORD *pts, QWORD *duration, DWORD *flags) { + IWMReaderCallbackAdvanced *callback_advanced = stream->reader->callback_advanced; struct wg_parser_stream *wg_stream = stream->wg_stream; struct wg_parser_event event; - struct buffer *object; if (stream->selection == WMT_OFF) return NS_E_INVALID_REQUEST; @@ -1746,6 +1750,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (stream->eos) return NS_E_NO_MORE_SAMPLES; + if (!stream->allocate_output) + callback_advanced = NULL; + for (;;) { if (!wg_parser_stream_get_event(wg_stream, &event)) @@ -1760,24 +1767,59 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, switch (event.type) { case WG_PARSER_EVENT_BUFFER: - /* FIXME: Should these be pooled? */ - if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + DWORD size, capacity; + INSSBuffer *sample; + HRESULT hr; + BYTE *data; + + if (callback_advanced) { - wg_parser_stream_release_buffer(wg_stream); - return E_OUTOFMEMORY; + if (FAILED(hr = IWMReaderCallbackAdvanced_AllocateForOutput(callback_advanced, + stream->index, event.u.buffer.size, &sample, NULL))) + { + ERR("Failed to allocate sample of %u bytes, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); + return hr; + } + } + else + { + struct buffer *object; + + /* FIXME: Should these be pooled? */ + if (!(object = calloc(1, offsetof(struct buffer, data[event.u.buffer.size])))) + { + wg_parser_stream_release_buffer(wg_stream); + return E_OUTOFMEMORY; + } + + object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; + object->refcount = 1; + object->capacity = event.u.buffer.size; + + TRACE("Created buffer %p.\n", object); + sample = &object->INSSBuffer_iface; } - object->INSSBuffer_iface.lpVtbl = &buffer_vtbl; - object->refcount = 1; - object->capacity = object->size = event.u.buffer.size; + if (FAILED(hr = INSSBuffer_GetBufferAndLength(sample, &data, &size))) + ERR("Failed to get data pointer, hr %#x.\n", hr); + if (FAILED(hr = INSSBuffer_GetMaxLength(sample, &capacity))) + ERR("Failed to get capacity, hr %#x.\n", hr); + if (event.u.buffer.size > capacity) + ERR("Returned capacity %u is less than requested capacity %u.\n", + capacity, event.u.buffer.size); - if (!wg_parser_stream_copy_buffer(wg_stream, object->data, 0, object->size)) + if (!wg_parser_stream_copy_buffer(wg_stream, data, 0, event.u.buffer.size)) { /* The GStreamer pin has been flushed. */ - free(object); + INSSBuffer_Release(sample); break; } + if (FAILED(hr = INSSBuffer_SetLength(sample, event.u.buffer.size))) + ERR("Failed to set size %u, hr %#x.\n", event.u.buffer.size, hr); + wg_parser_stream_release_buffer(wg_stream); if (!event.u.buffer.has_pts) @@ -1793,9 +1835,9 @@ HRESULT wm_reader_get_stream_sample(struct wm_stream *stream, if (!event.u.buffer.delta) *flags |= WM_SF_CLEANPOINT; - TRACE("Created buffer %p.\n", object); - *ret_sample = &object->INSSBuffer_iface; + *ret_sample = sample; return S_OK; + } case WG_PARSER_EVENT_EOS: stream->eos = true; @@ -1891,6 +1933,24 @@ HRESULT wm_reader_get_stream_selection(struct wm_reader *reader, return S_OK; } +HRESULT wm_reader_set_allocate_for_output(struct wm_reader *reader, DWORD output, BOOL allocate) +{ + struct wm_stream *stream; + + EnterCriticalSection(&reader->cs); + + if (!(stream = get_stream_by_output_number(reader, output))) + { + LeaveCriticalSection(&reader->cs); + return E_INVALIDARG; + } + + stream->allocate_output = !!allocate; + + LeaveCriticalSection(&reader->cs); + return S_OK; +} + void wm_reader_init(struct wm_reader *reader, const struct wm_reader_ops *ops) { reader->IWMHeaderInfo3_iface.lpVtbl = &header_info_vtbl;

1 0

Zebediah Figura : wmvcore/tests: Add tests for user-allocated samples.
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: 42da77bbcfeae16b5f138ad3f2a3e3030ae0844b URL: https://source.winehq.org/git/wine.git/?a=commit;h=42da77bbcfeae16b5f138ad3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:47 2021 -0600 wmvcore/tests: Add tests for user-allocated samples. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmvcore/tests/wmvcore.c | 434 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 415 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=42da77bbcfeae16b5f13…

1 0

Zebediah Figura : winegstreamer: Implement IWMReaderAdvanced::SetReceiveStreamSamples().
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: 894e0712459ec2d48b1298724776134d2a966f66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894e0712459ec2d48b129872… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 10 19:05:48 2021 -0600 winegstreamer: Implement IWMReaderAdvanced::SetReceiveStreamSamples(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 7 ++++ dlls/winegstreamer/wm_asyncreader.c | 20 +++++++---- dlls/winegstreamer/wm_reader.c | 23 +++++++++--- dlls/wmvcore/tests/wmvcore.c | 71 +++++++++++++++++++++++++++++++------ 4 files changed, 100 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=894e0712459ec2d48b12…

1 0

Zhiyi Zhang : comctl32/button: Use correct state for default buttons.
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: ed06aa2f7efc045f6f9914c817c255085e9d1daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed06aa2f7efc045f6f9914c8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:03:51 2021 +0800 comctl32/button: Use correct state for default buttons. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index b612273c0c1..93f6c21bab1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -410,7 +410,8 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) state = STATE_PRESSED; else if (infoPtr->state & BST_HOT) state = STATE_HOT; - else if (infoPtr->state & BST_FOCUS) + else if (infoPtr->state & BST_FOCUS || type == BS_DEFPUSHBUTTON || type == BS_DEFSPLITBUTTON + || (type == BS_DEFCOMMANDLINK && !(style & BS_PUSHLIKE))) state = STATE_DEFAULTED; else state = STATE_NORMAL;

1 0

Zhiyi Zhang : comctl32/button: Use correct state for BS_3STATE and BS_AUTO3STATE buttons.
by Alexandre Julliard Nov. 11, 2021

Nov. 11, 2021

Module: wine Branch: master Commit: a7f6d78406b536bd87b608856628f93d94e7a8dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f6d78406b536bd87b60885… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 11 15:03:45 2021 +0800 comctl32/button: Use correct state for BS_3STATE and BS_AUTO3STATE buttons. BS_3STATE and BS_AUTO3STATE are check boxes. Fix BS_3STATE and BS_AUTO3STATE buttons drawing indeterminate state as unchecked. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 19febd8b6ac..b612273c0c1 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -427,10 +427,10 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) return pb_states[state]; case BS_CHECKBOX: case BS_AUTOCHECKBOX: - return cb_states[check_state][state]; - case BS_RADIOBUTTON: case BS_3STATE: case BS_AUTO3STATE: + return cb_states[check_state][state]; + case BS_RADIOBUTTON: case BS_AUTORADIOBUTTON: return rb_states[check_state][state]; case BS_GROUPBOX:

1 0

Eric Pouech : mscvpdb.h: Fix string types.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: a15e1e815034c67f62ca09e53fd04dd8859cf31a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15e1e815034c67f62ca09e5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 10 16:42:28 2021 +0100 mscvpdb.h: Fix string types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 9a733333837..f7dcbcb6625 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -603,7 +603,7 @@ union codeview_fieldtype cv_typ_t type; unsigned short int offset; /* numeric leaf */ #if 0 - unsigned char name[1]; + char name[1]; #endif } member_v3; @@ -1986,7 +1986,7 @@ union codeview_symbol { unsigned short int len; unsigned short int id; - unsigned char name[1]; + char name[1]; } unamespace_v3; };

1 0

Rémi Bernon : dinput: Check for DIEFF_POLAR axes count before capacity.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 4289bae3b4be81ea47adc18c60f26b7dae8691a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4289bae3b4be81ea47adc18c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 10 10:52:26 2021 +0100 dinput: Check for DIEFF_POLAR axes count before capacity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51922 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 4 ++-- dlls/dinput8/tests/hid.c | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index dd77f557e3e..cec02ccd74a 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2063,14 +2063,14 @@ static HRESULT WINAPI hid_joystick_effect_GetParameters( IDirectInputEffect *ifa if (!direction_flags) return DIERR_INVALIDPARAM; count = params->cAxes = impl->params.cAxes; - if (capacity < params->cAxes) return DIERR_MOREDATA; if (!count) params->dwFlags &= ~(DIEFF_CARTESIAN | DIEFF_POLAR | DIEFF_SPHERICAL); + if ((direction_flags & DIEFF_POLAR) && count != 2) return DIERR_INVALIDPARAM; + if (capacity < params->cAxes) return DIERR_MOREDATA; if (direction_flags & DIEFF_SPHERICAL) memcpy( directions, impl->params.rglDirection, count * sizeof(LONG) ); else if (direction_flags & DIEFF_POLAR) { - if (count != 2) return DIERR_INVALIDPARAM; directions[0] = (impl->params.rglDirection[0] + 9000) % 36000; if (directions[0] < 0) directions[0] += 36000; } diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index 54109593a18..5b01ea3a68a 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -6138,11 +6138,7 @@ static void test_periodic_effect( IDirectInputDevice8W *device, HANDLE file, DWO desc.dwFlags = DIEFF_POLAR; desc.cAxes = 1; hr = IDirectInputEffect_GetParameters( effect, &desc, DIEP_DIRECTION ); - if (i != 2) - { - todo_wine_if( i == 3 ) - ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); - } + if (i != 2) ok( hr == DIERR_INVALIDPARAM, "GetParameters returned %#x\n", hr ); else ok( hr == DIERR_MOREDATA, "GetParameters returned %#x\n", hr ); desc.cAxes = 3; memset( desc.rglDirection, 0xcd, 3 * sizeof(LONG) );

1 0

Eric Pouech : dbghelp/pdb: Fix start adress of block.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 92fabc64e50d3201f3ed270214f9121f9952957d URL: https://source.winehq.org/git/wine.git/?a=commit;h=92fabc64e50d3201f3ed2702… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 10 16:42:03 2021 +0100 dbghelp/pdb: Fix start adress of block. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index c0d09b75c56..c481c762b1d 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2246,12 +2246,12 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, case S_BLOCK32_ST: block = symt_open_func_block(msc_dbg->module, curr_func, block, - codeview_get_address(msc_dbg, sym->block_v1.segment, sym->block_v1.offset), + codeview_get_address(msc_dbg, sym->block_v1.segment, sym->block_v1.offset) - curr_func->address, sym->block_v1.length); break; case S_BLOCK32: block = symt_open_func_block(msc_dbg->module, curr_func, block, - codeview_get_address(msc_dbg, sym->block_v3.segment, sym->block_v3.offset), + codeview_get_address(msc_dbg, sym->block_v3.segment, sym->block_v3.offset) - curr_func->address, sym->block_v3.length); break;

1 0

Eric Pouech : winedump: Better detect whether IPI stream is present.
by Alexandre Julliard Nov. 10, 2021

Nov. 10, 2021

Module: wine Branch: master Commit: 97c3c41732ffa3ac876378e96a42f5e38342f377 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97c3c41732ffa3ac876378e9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Nov 10 16:42:14 2021 +0100 winedump: Better detect whether IPI stream is present. Old version of PDB files can have a stream #4 which is not an IPI stream Available documentation isn't 100% clear about when IPI has been introduced. So decide that IPI is present when header of stream looks like a type stream header. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index ed4877cd10a..958a13f5e1c 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -54,6 +54,21 @@ struct pdb_reader DWORD file_used[1024]; }; +static inline BOOL has_file_been_read(struct pdb_reader* reader, unsigned file_nr) +{ + return reader->file_used[file_nr / 32] & (1 << (file_nr % 32)); +} + +static inline void mark_file_been_read(struct pdb_reader* reader, unsigned file_nr) +{ + reader->file_used[file_nr / 32] |= 1 << (file_nr % 32); +} + +static inline void clear_file_been_read(struct pdb_reader* reader, unsigned file_nr) +{ + reader->file_used[file_nr / 32] &= ~(1 << (file_nr % 32)); +} + static void* pdb_jg_read(const struct PDB_JG_HEADER* pdb, const WORD* block_list, int size) { int i, nBlocks; @@ -78,7 +93,7 @@ static void* pdb_jg_read_file(struct pdb_reader* reader, DWORD file_nr) if (!reader->u.jg.toc || file_nr >= reader->u.jg.toc->num_files) return NULL; - reader->file_used[file_nr / 32] |= 1 << (file_nr % 32); + mark_file_been_read(reader, file_nr); if (reader->u.jg.toc->file[file_nr].size == 0 || reader->u.jg.toc->file[file_nr].size == 0xFFFFFFFF) return NULL; @@ -125,7 +140,7 @@ static void pdb_exit(struct pdb_reader* reader) for (i = 0; i < pdb_get_num_files(reader); i++) { - if (reader->file_used[i / 32] & (1 << (i % 32))) continue; + if (has_file_been_read(reader, i)) continue; file = reader->read_file(reader, i); if (!file) continue; @@ -615,7 +630,14 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, unsigned file, const static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const char* strmname) { PDB_TYPES* types = NULL; + BOOL used = has_file_been_read(reader, strmidx); + if (pdb_get_file_size(reader, strmidx) < sizeof(*types)) + { + if (strmidx == 2) + printf("-Too small type header\n"); + return; + } types = reader->read_file(reader, strmidx); if (!types) return; @@ -628,7 +650,12 @@ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const ch case 20040203: /* VC 8.0 */ break; default: - printf("-Unknown type info version %d\n", types->version); + /* IPI stream is not always present in older PDB files */ + if (strmidx == 2) + printf("-Unknown type info version %d\n", types->version); + free(types); + if (used) clear_file_been_read(reader, strmidx); + return; } /* Read type table */ @@ -870,7 +897,7 @@ static void* pdb_ds_read_file(struct pdb_reader* reader, DWORD file_number) if (!reader->u.ds.toc || file_number >= reader->u.ds.toc->num_files) return NULL; - reader->file_used[file_number / 32] |= 1 << (file_number % 32); + mark_file_been_read(reader, file_number); if (reader->u.ds.toc->file_size[file_number] == 0 || reader->u.ds.toc->file_size[file_number] == 0xFFFFFFFF) return NULL; @@ -932,7 +959,7 @@ static void pdb_ds_dump(void) * - segments * - extended FPO data */ - reader.file_used[0] |= 1; /* mark stream #0 as read */ + mark_file_been_read(&reader, 0); /* mark stream #0 as read */ reader.u.ds.root = reader.read_file(&reader, 1); if (reader.u.ds.root) {

1 0