wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Nikolay Sivov : winedump: Add support for dumping handle data stream from minidumps.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 0d89f67ea21536f416eb4a0e4771b033066ff4fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d89f67ea21536f416eb4a0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:37 2022 +0300 winedump: Add support for dumping handle data stream from minidumps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/minidumpapiset.h | 39 ++++++++++++++++++++++++++++++++++++ tools/winedump/minidump.c | 50 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 83 insertions(+), 6 deletions(-) diff --git a/include/minidumpapiset.h b/include/minidumpapiset.h index 5409d6cd758..73994c0d3eb 100644 --- a/include/minidumpapiset.h +++ b/include/minidumpapiset.h @@ -373,6 +373,38 @@ typedef struct _MINIDUMP_USER_STREAM_INFORMATION PMINIDUMP_USER_STREAM UserStreamArray; } MINIDUMP_USER_STREAM_INFORMATION, *PMINIDUMP_USER_STREAM_INFORMATION; +typedef struct _MINIDUMP_HANDLE_DATA_STREAM +{ + ULONG32 SizeOfHeader; + ULONG32 SizeOfDescriptor; + ULONG32 NumberOfDescriptors; + ULONG32 Reserved; +} MINIDUMP_HANDLE_DATA_STREAM, *PMINIDUMP_HANDLE_DATA_STREAM; + +typedef struct _MINIDUMP_HANDLE_DESCRIPTOR +{ + ULONG64 Handle; + RVA TypeNameRva; + RVA ObjectNameRva; + ULONG32 Attributes; + ULONG32 GrantedAccess; + ULONG32 HandleCount; + ULONG32 PointerCount; +} MINIDUMP_HANDLE_DESCRIPTOR, *PMINIDUMP_HANDLE_DESCRIPTOR; + +typedef struct _MINIDUMP_HANDLE_DESCRIPTOR_2 +{ + ULONG64 Handle; + RVA TypeNameRva; + RVA ObjectNameRva; + ULONG32 Attributes; + ULONG32 GrantedAccess; + ULONG32 HandleCount; + ULONG32 PointerCount; + RVA ObjectInfoRva; + ULONG32 Reserved0; +} MINIDUMP_HANDLE_DESCRIPTOR_2, *PMINIDUMP_HANDLE_DESCRIPTOR_2; + typedef enum _MINIDUMP_STREAM_TYPE { UnusedStream = 0, @@ -393,6 +425,13 @@ typedef enum _MINIDUMP_STREAM_TYPE MiscInfoStream = 15, MemoryInfoListStream = 16, ThreadInfoListStream = 17, + HandleOperationListStream = 18, + TokenStream = 19, + JavaScriptDataStream = 20, + SystemMemoryInfoStream = 21, + ProcessVmCountersStream = 22, + IptTraceStream = 23, + ThreadNamesStream = 24, LastReservedStream = 0xffff } MINIDUMP_STREAM_TYPE; diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 9474381fd02..f8bd03ca0c5 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -34,7 +34,9 @@ static void dump_mdmp_data(const MINIDUMP_LOCATION_DESCRIPTOR* md, const char* p static void dump_mdmp_string(DWORD rva) { const MINIDUMP_STRING* ms = PRD(rva, sizeof(MINIDUMP_STRING)); - if (ms) + if (!rva) + printf("<<rva=0>>"); + else if (ms) dump_unicode_str( ms->Buffer, ms->Length / sizeof(WCHAR) ); else printf("<<?>>"); @@ -80,7 +82,7 @@ void mdmp_dump(void) const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); const MINIDUMP_DIRECTORY* dir; const void* stream; - unsigned int idx; + unsigned int i, idx; if (!hdr) { @@ -110,7 +112,6 @@ void mdmp_dump(void) { const MINIDUMP_THREAD_LIST *mtl = stream; const MINIDUMP_THREAD *mt = mtl->Threads; - unsigned int i; printf("Threads: %u\n", (UINT)mtl->NumberOfThreads); for (i = 0; i < mtl->NumberOfThreads; i++, mt++) @@ -133,7 +134,6 @@ void mdmp_dump(void) { const MINIDUMP_MODULE_LIST *mml = stream; const MINIDUMP_MODULE* mm = mml->Modules; - unsigned int i; const char* p1; const char* p2; @@ -224,7 +224,6 @@ void mdmp_dump(void) { const MINIDUMP_MEMORY_LIST *mml = stream; const MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; - unsigned int i; printf("Memory Ranges: %u\n", mml->NumberOfMemoryRanges); for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) @@ -419,7 +418,6 @@ void mdmp_dump(void) case ExceptionStream: { const MINIDUMP_EXCEPTION_STREAM *mes = stream; - unsigned int i; printf("Exception:\n"); printf(" ThreadId: %#x\n", mes->ThreadId); @@ -438,6 +436,46 @@ void mdmp_dump(void) dump_mdmp_data(&mes->ThreadContext, " "); } break; + case HandleDataStream: + { + const MINIDUMP_HANDLE_DATA_STREAM *mhd = stream; + const BYTE *desc; + + printf("Handle data:\n"); + printf(" SizeOfHeader: %u\n", mhd->SizeOfHeader); + printf(" SizeOfDescriptor: %u\n", mhd->SizeOfDescriptor); + printf(" NumberOfDescriptors: %u\n", mhd->NumberOfDescriptors); + + desc = (BYTE *)mhd + sizeof(*mhd); + for (i = 0; i < mhd->NumberOfDescriptors; ++i) + { + const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)desc; + + printf(" Handle [%u]:\n", i); + print_longlong(" Handle", hd->Handle); + printf(" TypeName: "); + dump_mdmp_string(hd->TypeNameRva); + printf("\n"); + printf(" ObjectName: "); + dump_mdmp_string(hd->ObjectNameRva); + printf("\n"); + printf(" Attributes: %#x\n", hd->Attributes); + printf(" GrantedAccess: %#x\n", hd->GrantedAccess); + printf(" HandleCount: %u\n", hd->HandleCount); + printf(" PointerCount: %#x\n", hd->PointerCount); + + if (mhd->SizeOfDescriptor >= sizeof(MINIDUMP_HANDLE_DESCRIPTOR_2)) + { + printf(" ObjectInfo: "); + dump_mdmp_string(hd->ObjectInfoRva); + printf("\n"); + printf(" Reserved0: %#x\n", hd->Reserved0); + } + + desc += mhd->SizeOfDescriptor; + } + } + break; default: printf("NIY %d\n", dir->StreamType);

1 0

Nikolay Sivov : winedump: Cleanup minidump output helpers.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: a9f9c1a696e587424ab26e5465c38b9ec0c266dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9f9c1a696e587424ab26e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:36 2022 +0300 winedump: Cleanup minidump output helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/minidump.c | 122 ++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9f9c1a696e587424ab2…

1 0

Nikolay Sivov : winedump: Output minidump streams in order they appear in the file.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 38d7ea5c6fd997fcdc505858a571687d14e6444e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38d7ea5c6fd997fcdc505858… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:35 2022 +0300 winedump: Output minidump streams in order they appear in the file. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/minidump.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index b834ec887e4..efc91bfdbfd 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -40,21 +40,6 @@ static void dump_mdmp_string(DWORD rva) printf("<<?>>"); } -static const MINIDUMP_DIRECTORY* get_mdmp_dir(const MINIDUMP_HEADER* hdr, unsigned int str_idx) -{ - const MINIDUMP_DIRECTORY* dir; - unsigned int i; - - for (i = 0; i < hdr->NumberOfStreams; i++) - { - dir = PRD(hdr->StreamDirectoryRva + i * sizeof(MINIDUMP_DIRECTORY), - sizeof(MINIDUMP_DIRECTORY)); - if (!dir) continue; - if (dir->StreamType == str_idx) return dir; - } - return NULL; -} - enum FileSig get_kind_mdmp(void) { const DWORD* pdw; @@ -69,9 +54,9 @@ enum FileSig get_kind_mdmp(void) void mdmp_dump(void) { const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); - UINT idx, ndir = 0; const MINIDUMP_DIRECTORY* dir; const void* stream; + unsigned int idx; if (!hdr) { @@ -79,27 +64,29 @@ void mdmp_dump(void) return; } - printf("Signature: %u (%.4s)\n", (UINT)hdr->Signature, (const char*)&hdr->Signature); - printf("Version: %x\n", (UINT)hdr->Version); - printf("NumberOfStreams: %u\n", (UINT)hdr->NumberOfStreams); + printf("Signature: %#x (%.4s)\n", hdr->Signature, (const char*)&hdr->Signature); + printf("Version: %#x\n", hdr->Version); + printf("NumberOfStreams: %u\n", hdr->NumberOfStreams); printf("StreamDirectoryRva: %u\n", (UINT)hdr->StreamDirectoryRva); - printf("CheckSum: %u\n", (UINT)hdr->CheckSum); + printf("CheckSum: %u\n", hdr->CheckSum); printf("TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); printf("Flags: %x%08x\n", (UINT)(hdr->Flags >> 32), (UINT)hdr->Flags); - for (idx = 0; idx <= LastReservedStream; idx++) + for (idx = 0; idx < hdr->NumberOfStreams; ++idx) { - if (!(dir = get_mdmp_dir(hdr, idx))) continue; + dir = PRD(hdr->StreamDirectoryRva + idx * sizeof(MINIDUMP_DIRECTORY), sizeof(*dir)); + if (!dir) break; stream = PRD(dir->Location.Rva, dir->Location.DataSize); - printf("Directory [%u]: ", ndir++); + + printf("Stream [%u]: ", idx); switch (dir->StreamType) { case ThreadListStream: { - const MINIDUMP_THREAD_LIST* mtl = (const MINIDUMP_THREAD_LIST*)stream; - const MINIDUMP_THREAD* mt = mtl->Threads; - unsigned int i; + const MINIDUMP_THREAD_LIST *mtl = stream; + const MINIDUMP_THREAD *mt = mtl->Threads; + unsigned int i; printf("Threads: %u\n", (UINT)mtl->NumberOfThreads); for (i = 0; i < mtl->NumberOfThreads; i++, mt++)

1 0

Nikolay Sivov : include: Move minidump types to a separate header.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 61f31d149cab08a88e591fd0e3c0d5466cbc7da6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61f31d149cab08a88e591fd0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 17 22:20:34 2022 +0300 include: Move minidump types to a separate header. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dbghelp.h | 388 +------------------------------------ include/minidumpapiset.h | 412 ++++++++++++++++++++++++++++++++++++++++ programs/winedbg/tgt_minidump.c | 2 +- 4 files changed, 416 insertions(+), 387 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61f31d149cab08a88e59…

1 0

Philip Allison : uiautomationcore: Fix header compatibility with C++.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 26637de7cbc770cab20c6e35a828cc9e93fcfc9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=26637de7cbc770cab20c6e35… Author: Philip Allison <mangobrain(a)gmail.com> Date: Fri May 13 21:54:23 2022 +0100 uiautomationcore: Fix header compatibility with C++. Rename arguments to UiaRaiseAutomationPropertyChangedEvent to avoid conflicts with reserved words when included from C++ applications. Signed-off-by: Philip Allison <mangobrain(a)googlemail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcoreapi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 22b3888dc6e..7f60fb45727 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -69,7 +69,7 @@ HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); -HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *provider, PROPERTYID id, VARIANT old, VARIANT new); +HRESULT WINAPI UiaRaiseAutomationPropertyChangedEvent(IRawElementProviderSimple *, PROPERTYID, VARIANT, VARIANT); void WINAPI UiaRegisterProviderCallback(UiaProviderCallback *pCallback); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj);

1 0

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.ConditionForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 4e04446c9b8721acb0098ff4a0b303923398ea21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e04446c9b8721acb0098ff4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 12:04:29 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.ConditionForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/condition_effect.c | 272 +++++++++++++++++++++++++++ dlls/windows.gaming.input/force_feedback.c | 18 ++ dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 7 + 7 files changed, 301 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e04446c9b8721acb009…

1 0

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.PeriodicForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8d45305400404e0a80dcd9c41bc6c3058617cc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d45305400404e0a80dcd9c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 12:01:46 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.PeriodicForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/force_feedback.c | 21 ++ dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/periodic_effect.c | 284 ++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 8 + 7 files changed, 317 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d45305400404e0a80dc…

1 0

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.RampForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 569036b1f087c4f69766d972665e35dd078f6ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=569036b1f087c4f69766d972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:58:17 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.RampForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/force_feedback.c | 8 + dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 1 + dlls/windows.gaming.input/ramp_effect.c | 240 +++++++++++++++++++++++++++++ 7 files changed, 253 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=569036b1f087c4f69766…

1 0

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.ConditionForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: ea71b9f81b527496fd1027eaa724e0b62281b037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea71b9f81b527496fd1027ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:25:54 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.ConditionForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 172 ++++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea71b9f81b527496fd10…

1 0

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.RampForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: e9f430d955d347be484b8a10f41bb3a7b6c0fa4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f430d955d347be484b8a10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:22:34 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.RampForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 172 +++++++++++++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9f430d955d347be484b…

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
91
Older →

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 May 2022