September 2021 - Wine-Commits

Derek Lesho : winegstreamer: Allocate source media buffers in the PE components.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 8b7390f80d866435f06f2571a93bcd67c0947673 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b7390f80d866435f06f2571… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 15 18:00:09 2021 -0500 winegstreamer: Allocate source media buffers in the PE components. This necessitates an extra blit for the input data, but this is necessary for both WoW64 support and an internal rework of the source path in wg_parser to use GstAppSrc. Since source data is usually compressed and not a bottleneck, we don't expect this to affect performance. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> 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/media_source.c | 28 ++++++++++++++++++++++++---- dlls/winegstreamer/quartz_parser.c | 26 +++++++++++++++++++++++--- dlls/winegstreamer/wg_parser.c | 28 +++++++++++++++------------- 4 files changed, 66 insertions(+), 23 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index c29fc4a2437..49e06b31369 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -170,9 +170,10 @@ struct unix_funcs void (CDECL *wg_parser_begin_flush)(struct wg_parser *parser); void (CDECL *wg_parser_end_flush)(struct wg_parser *parser); - bool (CDECL *wg_parser_get_read_request)(struct wg_parser *parser, - void **data, uint64_t *offset, uint32_t *size); - void (CDECL *wg_parser_complete_read_request)(struct wg_parser *parser, bool ret); + bool (CDECL *wg_parser_get_next_read_offset)(struct wg_parser *parser, + uint64_t *offset, uint32_t *size); + void (CDECL *wg_parser_push_data)(struct wg_parser *parser, + const void *data, uint32_t size); void (CDECL *wg_parser_set_unlimited_buffering)(struct wg_parser *parser); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 95bdb9b488e..825bad8da27 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -530,6 +530,11 @@ static DWORD CALLBACK read_thread(void *arg) { struct media_source *source = arg; IMFByteStream *byte_stream = source->byte_stream; + uint32_t buffer_size = 0; + uint64_t file_size; + void *data = NULL; + + IMFByteStream_GetLength(byte_stream, &file_size); TRACE("Starting read thread for media source %p.\n", source); @@ -539,18 +544,33 @@ static DWORD CALLBACK read_thread(void *arg) ULONG ret_size; uint32_t size; HRESULT hr; - void *data; - if (!unix_funcs->wg_parser_get_read_request(source->wg_parser, &data, &offset, &size)) + if (!unix_funcs->wg_parser_get_next_read_offset(source->wg_parser, &offset, &size)) continue; + if (offset >= file_size) + size = 0; + else if (offset + size >= file_size) + size = file_size - offset; + + if (size > buffer_size) + { + buffer_size = size; + data = realloc(data, size); + } + + ret_size = 0; + if (SUCCEEDED(hr = IMFByteStream_SetCurrentPosition(byte_stream, offset))) hr = IMFByteStream_Read(byte_stream, data, size, &ret_size); - if (SUCCEEDED(hr) && ret_size != size) + if (FAILED(hr)) + ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr); + else if (ret_size != size) ERR("Unexpected short read: requested %u bytes, got %u.\n", size, ret_size); - unix_funcs->wg_parser_complete_read_request(source->wg_parser, SUCCEEDED(hr)); + unix_funcs->wg_parser_push_data(source->wg_parser, SUCCEEDED(hr) ? data : NULL, ret_size); } + free(data); TRACE("Media source is shutting down; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 09a916d7f5c..5299f4dc2ed 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -785,6 +785,11 @@ static DWORD CALLBACK stream_thread(void *arg) static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; + LONGLONG file_size, unused; + uint32_t buffer_size = 0; + void *data = NULL; + + IAsyncReader_Length(filter->reader, &file_size, &unused); TRACE("Starting read thread for filter %p.\n", filter); @@ -793,14 +798,29 @@ static DWORD CALLBACK read_thread(void *arg) uint64_t offset; uint32_t size; HRESULT hr; - void *data; - if (!unix_funcs->wg_parser_get_read_request(filter->wg_parser, &data, &offset, &size)) + if (!unix_funcs->wg_parser_get_next_read_offset(filter->wg_parser, &offset, &size)) continue; + + if (offset >= file_size) + size = 0; + else if (offset + size >= file_size) + size = file_size - offset; + + if (size > buffer_size) + { + buffer_size = size; + data = realloc(data, size); + } + hr = IAsyncReader_SyncRead(filter->reader, offset, size, data); - unix_funcs->wg_parser_complete_read_request(filter->wg_parser, SUCCEEDED(hr)); + if (FAILED(hr)) + ERR("Failed to read %u bytes at offset %I64u, hr %#x.\n", size, offset, hr); + + unix_funcs->wg_parser_push_data(filter->wg_parser, SUCCEEDED(hr) ? data : NULL, size); } + free(data); TRACE("Streaming stopped; exiting.\n"); return 0; } diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 119cbffbd88..f0815e37689 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -517,8 +517,8 @@ static void CDECL wg_parser_end_flush(struct wg_parser *parser) pthread_mutex_unlock(&parser->mutex); } -static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, - void **data, uint64_t *offset, uint32_t *size) +static bool CDECL wg_parser_get_next_read_offset(struct wg_parser *parser, + uint64_t *offset, uint32_t *size) { pthread_mutex_lock(&parser->mutex); @@ -531,7 +531,6 @@ static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, return false; } - *data = parser->read_request.data; *offset = parser->read_request.offset; *size = parser->read_request.size; @@ -539,11 +538,15 @@ static bool CDECL wg_parser_get_read_request(struct wg_parser *parser, return true; } -static void CDECL wg_parser_complete_read_request(struct wg_parser *parser, bool ret) +static void CDECL wg_parser_push_data(struct wg_parser *parser, + const void *data, uint32_t size) { pthread_mutex_lock(&parser->mutex); + parser->read_request.size = size; parser->read_request.done = true; - parser->read_request.ret = ret; + parser->read_request.ret = !!data; + if (data) + memcpy(parser->read_request.data, data, size); parser->read_request.data = NULL; pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->read_done_cond); @@ -1214,10 +1217,6 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; parser->next_pull_offset = offset + size; - if (offset >= parser->file_size) - return GST_FLOW_EOS; - if (offset + size >= parser->file_size) - size = parser->file_size - offset; if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); @@ -1241,6 +1240,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, pthread_cond_wait(&parser->read_done_cond, &parser->mutex); ret = parser->read_request.ret; + gst_buffer_set_size(*buffer, parser->read_request.size); pthread_mutex_unlock(&parser->mutex); @@ -1248,10 +1248,12 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GST_LOG("Request returned %d.", ret); - if (!ret && new_buffer) + if ((!ret || !size) && new_buffer) gst_buffer_unref(new_buffer); - return ret ? GST_FLOW_OK : GST_FLOW_ERROR; + if (ret) + return size ? GST_FLOW_OK : GST_FLOW_EOS; + return GST_FLOW_ERROR; } static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) @@ -1918,8 +1920,8 @@ static const struct unix_funcs funcs = wg_parser_begin_flush, wg_parser_end_flush, - wg_parser_get_read_request, - wg_parser_complete_read_request, + wg_parser_get_next_read_offset, + wg_parser_push_data, wg_parser_set_unlimited_buffering,

1 0

Derek Lesho : winegstreamer: Replace source pad interface with GstAppSrc.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 1aa359a100bae859b278007e8bf90673eebd7db0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aa359a100bae859b278007e… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Sep 15 18:00:10 2021 -0500 winegstreamer: Replace source pad interface with GstAppSrc. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 425 ++++++++++++----------------------------- 1 file changed, 117 insertions(+), 308 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1aa359a100bae859b278…

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInput8_CreateDevice tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 2972e9973ea4ca4a5f677149da4a3646ba97247e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2972e9973ea4ca4a5f677149… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:39 2021 +0200 dinput8/tests: Add some HID joystick IDirectInput8_CreateDevice tests. Creating a device with the instance guid may get the wrong one if a true controller is plugged in. This is because driver_hid.dll runs in a different process from winehid.sys, and so gets another set of rawinput handles. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index fbcb1e27afb..898dd7a6cdf 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -3443,6 +3443,26 @@ static void test_simple_joystick(void) check_member( devinst, expect_devinst, "%04x", wUsagePage ); check_member( devinst, expect_devinst, "%04x", wUsage ); + hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, NULL, NULL ); + ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, NULL, &device, NULL ); + ok( hr == E_POINTER, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, &GUID_NULL, &device, NULL ); + ok( hr == DIERR_DEVICENOTREG, "IDirectInput8_CreateDevice returned %#x\n", hr ); + hr = IDirectInput8_CreateDevice( di, &devinst.guidInstance, &device, NULL ); + ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr ); + + prop_dword.dwData = 0xdeadbeef; + hr = IDirectInputDevice8_GetProperty( device, DIPROP_VIDPID, &prop_dword.diph ); + ok( hr == DI_OK, "IDirectInputDevice8_GetProperty DIPROP_VIDPID returned %#x\n", hr ); + /* Wine may get the wrong device here, because the test driver creates another instance of + hidclass.sys, and gets duplicate rawinput handles, which we use in the guidInstance */ + todo_wine_if( prop_dword.dwData != EXPECT_VIDPID ) + ok( prop_dword.dwData == EXPECT_VIDPID, "got %#x expected %#x\n", prop_dword.dwData, EXPECT_VIDPID ); + + ref = IDirectInputDevice8_Release( device ); + ok( ref == 0, "IDirectInputDeviceW_Release returned %d\n", ref ); + hr = IDirectInput8_CreateDevice( di, &expect_guid_product, &device, NULL ); ok( hr == DI_OK, "IDirectInput8_CreateDevice returned %#x\n", hr );

1 0

Rémi Bernon : dinput8/tests: Add some HID joystick IDirectInputDevice8_GetProperty tests.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: c5e864d4b6cd0f7312f754a2178f041cd7a4b160 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5e864d4b6cd0f7312f754a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:20:38 2021 +0200 dinput8/tests: Add some HID joystick IDirectInputDevice8_GetProperty tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/hid.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5e864d4b6cd0f7312f7…

1 0

Alexandre Julliard : shell32: Load the XDG user dirs config file using Win32 APIs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: d603b22a0cc81fdce64be6a59d7453023e3410a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d603b22a0cc81fdce64be6a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 10:58:12 2021 +0200 shell32: Load the XDG user dirs config file using Win32 APIs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 193 ++++++++++++++++++++++----------------- dlls/shell32/xdg.c | 229 ----------------------------------------------- dlls/shell32/xdg.h | 2 - 3 files changed, 113 insertions(+), 311 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d603b22a0cc81fdce64b…

1 0

Dmitry Timoshkov : riched20: Don't create custom heap.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 8bff437e9d5e047e689d8b32f62995785c0cd48e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bff437e9d5e047e689d8b32… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 15 18:59:47 2021 +0300 riched20: Don't create custom heap. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 1 - dlls/riched20/editor.h | 1 - dlls/riched20/txthost.c | 2 -- 3 files changed, 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index cc02604767e..3bf499681ed 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -246,7 +246,6 @@ static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int HINSTANCE dll_instance = NULL; BOOL me_debug = FALSE; -HANDLE me_heap = NULL; static ME_TextBuffer *ME_MakeText(void) { ME_TextBuffer *buf = heap_alloc(sizeof(*buf)); diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index fdf3e068fe9..7bdd1bf5efe 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -23,7 +23,6 @@ struct _RTF_Info; extern HINSTANCE dll_instance DECLSPEC_HIDDEN; -extern HANDLE me_heap DECLSPEC_HIDDEN; #define RUN_IS_HIDDEN(run) ((run)->style->fmt.dwMask & CFM_HIDDEN \ && (run)->style->fmt.dwEffects & CFE_HIDDEN) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 6d2221e4d69..e18ec9490c0 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1639,7 +1639,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) case DLL_PROCESS_ATTACH: dll_instance = instance; DisableThreadLibraryCalls( instance ); - me_heap = HeapCreate( 0, 0x10000, 0 ); if (!register_classes( instance )) return FALSE; LookupInit(); break; @@ -1653,7 +1652,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) if (listbox_registered) UnregisterClassW( L"REListBox20W", 0 ); if (combobox_registered) UnregisterClassW( L"REComboBox20W", 0 ); LookupCleanup(); - HeapDestroy( me_heap ); release_typelib(); break; }

1 0

Connor McAdams : user32/tests: Add missing winevents to test_messages() message sequences.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 633dbf3b79fbd2266aa1716ad28bda14aa1e57b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=633dbf3b79fbd2266aa1716a… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 15 03:00:15 2021 -0400 user32/tests: Add missing winevents to test_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=633dbf3b79fbd2266aa1…

1 0

Connor McAdams : user32/tests: Fix existing winevents in test_messages() message sequences.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 2583d85fcf4354d8b435a9fc8eca93eb00179742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2583d85fcf4354d8b435a9fc… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 15 03:00:14 2021 -0400 user32/tests: Fix existing winevents in test_messages() message sequences. Set the appropriate message flags for the existing WinEvents in the test_messages() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 204 ++++++++++++++++++++++++------------------------ 1 file changed, 102 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2583d85fcf4354d8b435…

1 0

Connor McAdams : user32/tests: Fix occasional failure in test_messages() message sequences.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 90ab555bbc31a88e07e102852a12a4d9ffc45c5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=90ab555bbc31a88e07e10285… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Sep 15 03:00:13 2021 -0400 user32/tests: Fix occasional failure in test_messages() message sequences. Some window messages in the WmShowPopupExtremeLocationSeq message sequence aren't always sent on Win8+. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8e523edd5ba..e7728ee151f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1108,8 +1108,8 @@ static const struct message WmShowPopupExtremeLocationSeq[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { HCBT_SETFOCUS, hook }, { WM_SETFOCUS, sent|defwinproc }, - { WM_NCPAINT, sent|wparam, 1 }, - { WM_ERASEBKGND, sent }, + { WM_NCPAINT, sent|wparam|optional, 1 }, /* Not always sent on Win8+ */ + { WM_ERASEBKGND, sent|optional }, /* Not always sent on Win8+ */ { WM_WINDOWPOSCHANGED, sent }, /* occasionally received on test machines */ { WM_NCPAINT, sent|optional },

1 0

Eric Pouech : winedbg: Show dwarf version(s) used for a module.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: wine Branch: master Commit: 0646e156655b1d21e672f09b4854221091c4fb91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0646e156655b1d21e672f09b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:40 2021 +0200 winedbg: Show dwarf version(s) used for a module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 10 +++++++++- programs/winedbg/info.c | 13 ++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a9ff9ff2354..90addb9a6b7 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -182,6 +182,7 @@ typedef struct dwarf2_parse_module_context_s const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ struct vector unit_contexts; + DWORD cu_versions; } dwarf2_parse_module_context_t; enum unit_status @@ -2517,6 +2518,8 @@ static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, TRACE("- word_size: %u\n", ctx->head.word_size); TRACE("- offset_size: %u\n", ctx->head.offset_size); + if (ctx->head.version >= 2) + ctx->module_ctx->cu_versions |= 1 << (ctx->head.version - 2); if (max_supported_dwarf_version == 0) { char* env = getenv("DBGHELP_DWARF_VERSION"); @@ -3732,6 +3735,7 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); + module_ctx.cu_versions = 0; /* phase I: parse all CU heads */ mod_ctx.data = section[section_debug].address; @@ -3749,7 +3753,11 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); dwarf2_modfmt->module->module.SymType = SymDia; - dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24); + /* hide dwarf versions in CVSig + * bits 24-31 will be set according to found dwarf version + * different CU can have different dwarf version, so use a bit per version (version 2 => b24) + */ + dwarf2_modfmt->module->module.CVSig = 'D' | ('W' << 8) | ('F' << 16) | ((module_ctx.cu_versions & 0xFF) << 24); /* FIXME: we could have a finer grain here */ dwarf2_modfmt->module->module.GlobalSymbols = TRUE; dwarf2_modfmt->module->module.TypeInfo = TRUE; diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index a6335092d84..36da71c4713 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -137,10 +137,21 @@ static const char* get_symtype_str(const IMAGEHLP_MODULE64* mi) case 'S' | ('T' << 8) | ('A' << 16) | ('B' << 24): return "Stabs"; case 'D' | ('W' << 8) | ('A' << 16) | ('R' << 24): + /* previous versions of dbghelp used to report this... */ return "Dwarf"; default: + if ((mi->CVSig & 0x00FFFFFF) == ('D' | ('W' << 8) | ('F' << 16))) + { + static char tmp[64]; + DWORD versbit = mi->CVSig >> 24; + strcpy(tmp, "Dwarf"); + if (versbit & 1) strcat(tmp, "-2"); + if (versbit & 2) strcat(tmp, "-3"); + if (versbit & 4) strcat(tmp, "-4"); + if (versbit & 8) strcat(tmp, "-5"); + return tmp; + } return "DIA"; - } } }

1 0