diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index b189e59e8..c7c528362 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,7 +7,15 @@ assignees: '' --- -**Describe the bug** +**Your Setup:** +- Olive version (window title or Help > About): +- Source: (e.g. AppImage, PPA, AUR, website etc.) +- Operating system: (e.g. Ubuntu 18.04 64-bit) +- CPU: (e.g. Intel i5-4300U) +- RAM: (e.g. 8GB) +- GPU: (e.g. NVIDIA Geforce GT 1030 2GB (Driver ver xxx.xx.xx)) + +**Describe the Bug** A clear and concise description of what the bug is. **To Reproduce** @@ -17,31 +25,14 @@ Steps to reproduce the behavior: 3. Scroll down to '....' 4. See error -**Expected behavior** -A clear and concise description of what you expected to happen. - **Screenshots** If applicable, add screenshots to help explain your problem. -**Desktop (please complete the following information):** -- Olive version: [e.g. Git hash from window title or Help > About] -- Source: [e.g. AppImage, Website etc.] -- Operating system: [e.g. Ubuntu 18.04 64-bit] -- CPU: [e.g. Intel i5-4300U] -- RAM: [e.g. 8GB] -- GPU: [e.g. NVIDIA Geforce GT 1030 2GB (Driver ver xxx.xx.xx)] - -### Output Log +** Debug Log and/or Crash Report ** ``` -[Paste output log] +[Paste log/report] ``` -### GDB/CDB Backtrace (for crashes) - -``` -[If you can reproduce this issue, try running Olive through GDB and retrieving a backtrace, then paste the backtrace here. Instructions are available in the Wiki on how to acquire this backtrace.] -``` - -**Additional context** -Add any other context about the problem here. +**Additional Details** +Add any other information about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index 11d81bb48..4aa43fc9e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -7,11 +7,6 @@ assignees: '' --- -**I have read the following** -- [ ] The Olive Wiki -- [ ] Previous issues that include "FR" or "Feature Request" -- [ ] Olive's Project Tab - **Is your feature request related to a problem? Please describe.** A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f056badf..4cf2538bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -499,8 +499,7 @@ add_executable(${OLIVE_TARGET} target_compile_definitions(${OLIVE_TARGET} PRIVATE ${OLIVE_DEFINITIONS}) -target_compile_options(${OLIVE_TARGET} PRIVATE $<$:-Wno-reorder -rdynamic>) -target_link_options(${OLIVE_TARGET} PRIVATE $<$:-rdynamic>) +target_compile_options(${OLIVE_TARGET} PRIVATE $<$:-Wno-reorder>) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -522,6 +521,15 @@ target_link_libraries(${OLIVE_TARGET} OpenColorIO ) +if(MINGW) + target_link_libraries(${OLIVE_TARGET} PRIVATE DbgHelp) + + # Crash report uses MSVC-style PDBs, we convert symbols to this format here + add_custom_command(TARGET ${OLIVE_TARGET} + POST_BUILD + COMMAND ${CMAKE_SOURCE_DIR}/packaging/windows/cv2pdb -C -n "${CMAKE_BINARY_DIR}/${OLIVE_TARGET}.exe") +endif() + if(DOXYGEN_FOUND AND BUILD_DOXYGEN) set(DOXYGEN_PROJECT_NAME "Olive") set(DOXYGEN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/docs") @@ -551,4 +559,6 @@ if(UNIX AND NOT APPLE) install(FILES packaging/linux/icons/256x256/application-vnd.olive-project.png DESTINATION share/icons/hicolor/256x256/mimetypes) install(FILES packaging/linux/icons/512x512/application-vnd.olive-project.png DESTINATION share/icons/hicolor/512x512/mimetypes) install(FILES ${OLIVE_QM_FILES} DESTINATION share/olive-editor/ts) + + target_link_options(${OLIVE_TARGET} PRIVATE $<$:-rdynamic>) endif() diff --git a/dialogs/crashdialog.cpp b/dialogs/crashdialog.cpp index 78b971790..6d31537f3 100644 --- a/dialogs/crashdialog.cpp +++ b/dialogs/crashdialog.cpp @@ -17,7 +17,6 @@ CrashDialog::CrashDialog() "Please send the following data to developers:"))); text_edit = new QTextEdit(); - //text_edit->setWordWrapMode(QTextOption::NoWrap); text_edit->setReadOnly(true); layout->addWidget(text_edit); @@ -37,11 +36,11 @@ CrashDialog::CrashDialog() text_edit->append(QString()); } -void CrashDialog::SetData(int signal, char **t, int size) +void CrashDialog::SetData(int signal, const QStringList& strings) { text_edit->append(QString("Signal: %1").arg(signal)); text_edit->append(QString()); - for (int i=0;iappend(t[i]); + for (int i=0;iappend(strings.at(i)); } } diff --git a/dialogs/crashdialog.h b/dialogs/crashdialog.h index c4e601d3a..23133f7c3 100644 --- a/dialogs/crashdialog.h +++ b/dialogs/crashdialog.h @@ -9,7 +9,7 @@ class CrashDialog : public QDialog public: CrashDialog(); - void SetData(int signal, char** t, int size); + void SetData(int signal, const QStringList &strings); private: QTextEdit* text_edit; diff --git a/main.cpp b/main.cpp index a87c88532..9beab8703 100644 --- a/main.cpp +++ b/main.cpp @@ -22,7 +22,12 @@ #include #ifdef __GNUC__ +#ifdef Q_OS_WIN +#include +#include +#elif defined(Q_OS_LINUX) #include +#endif #include #include #endif @@ -43,6 +48,81 @@ extern "C" { #ifdef __GNUC__ void handler(int sig) { + QStringList strings; + +#ifdef Q_OS_WIN + HANDLE process = GetCurrentProcess(); + HANDLE thread = GetCurrentThread(); + + CONTEXT context; + memset(&context, 0, sizeof(CONTEXT)); + context.ContextFlags = CONTEXT_FULL; + RtlCaptureContext(&context); + + SymInitialize(process, NULL, TRUE); + + DWORD image; + STACKFRAME64 stackframe; + ZeroMemory(&stackframe, sizeof(STACKFRAME64)); + +#ifdef _M_IX86 + image = IMAGE_FILE_MACHINE_I386; + stackframe.AddrPC.Offset = context.Eip; + stackframe.AddrPC.Mode = AddrModeFlat; + stackframe.AddrFrame.Offset = context.Ebp; + stackframe.AddrFrame.Mode = AddrModeFlat; + stackframe.AddrStack.Offset = context.Esp; + stackframe.AddrStack.Mode = AddrModeFlat; +#elif _M_X64 + image = IMAGE_FILE_MACHINE_AMD64; + stackframe.AddrPC.Offset = context.Rip; + stackframe.AddrPC.Mode = AddrModeFlat; + stackframe.AddrFrame.Offset = context.Rsp; + stackframe.AddrFrame.Mode = AddrModeFlat; + stackframe.AddrStack.Offset = context.Rsp; + stackframe.AddrStack.Mode = AddrModeFlat; +#elif _M_IA64 + image = IMAGE_FILE_MACHINE_IA64; + stackframe.AddrPC.Offset = context.StIIP; + stackframe.AddrPC.Mode = AddrModeFlat; + stackframe.AddrFrame.Offset = context.IntSp; + stackframe.AddrFrame.Mode = AddrModeFlat; + stackframe.AddrBStore.Offset = context.RsBSP; + stackframe.AddrBStore.Mode = AddrModeFlat; + stackframe.AddrStack.Offset = context.IntSp; + stackframe.AddrStack.Mode = AddrModeFlat; +#endif + + int counter = 0; + QString line_template = "[%1] %2"; + while (StackWalk64( + image, process, thread, + &stackframe, &context, NULL, + SymFunctionTableAccess64, SymGetModuleBase64, NULL)) { + + char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)]; + PSYMBOL_INFO symbol = (PSYMBOL_INFO)buffer; + symbol->SizeOfStruct = sizeof(SYMBOL_INFO); + symbol->MaxNameLen = MAX_SYM_NAME; + + DWORD64 displacement = 0; + + + QString sym_name; + if (SymFromAddr(process, stackframe.AddrPC.Offset, &displacement, symbol)) { + sym_name = symbol->Name; + } else { + sym_name = "???"; + } + QString s = line_template.arg(QString::number(counter), sym_name); + strings.append(s); + qDebug() << s; + + counter++; + } + + SymCleanup(process); +#elif defined(Q_OS_LINUX) void *array[10]; size_t size; @@ -55,10 +135,16 @@ void handler(int sig) { // try to show a GUI crash report char** bt_syms = backtrace_symbols(array, size); - olive::crash_dialog->SetData(sig, bt_syms, size); - olive::crash_dialog->exec(); + for (int i=0;iSetData(sig, strings); + olive::crash_dialog->exec(); + abort(); } #endif diff --git a/packaging/windows/cv2pdb.LICENSE b/packaging/windows/cv2pdb.LICENSE new file mode 100644 index 000000000..32efefcf6 --- /dev/null +++ b/packaging/windows/cv2pdb.LICENSE @@ -0,0 +1,201 @@ + The Artistic License 2.0 + + Copyright (c) 2000-2006, The Perl Foundation. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + +This license establishes the terms under which a given free software +Package may be copied, modified, distributed, and/or redistributed. +The intent is that the Copyright Holder maintains some artistic +control over the development of that Package while still keeping the +Package available as open source and free software. + +You are always permitted to make arrangements wholly outside of this +license directly with the Copyright Holder of a given Package. If the +terms of this license do not permit the full use that you propose to +make of the Package, you should contact the Copyright Holder and seek +a different licensing arrangement. + +Definitions + + "Copyright Holder" means the individual(s) or organization(s) + named in the copyright notice for the entire Package. + + "Contributor" means any party that has contributed code or other + material to the Package, in accordance with the Copyright Holder's + procedures. + + "You" and "your" means any person who would like to copy, + distribute, or modify the Package. + + "Package" means the collection of files distributed by the + Copyright Holder, and derivatives of that collection and/or of + those files. A given Package may consist of either the Standard + Version, or a Modified Version. + + "Distribute" means providing a copy of the Package or making it + accessible to anyone else, or in the case of a company or + organization, to others outside of your company or organization. + + "Distributor Fee" means any fee that you charge for Distributing + this Package or providing support for this Package to another + party. It does not mean licensing fees. + + "Standard Version" refers to the Package if it has not been + modified, or has been modified only in ways explicitly requested + by the Copyright Holder. + + "Modified Version" means the Package, if it has been changed, and + such changes were not explicitly requested by the Copyright + Holder. + + "Original License" means this Artistic License as Distributed with + the Standard Version of the Package, in its current version or as + it may be modified by The Perl Foundation in the future. + + "Source" form means the source code, documentation source, and + configuration files for the Package. + + "Compiled" form means the compiled bytecode, object code, binary, + or any other form resulting from mechanical transformation or + translation of the Source form. + + +Permission for Use and Modification Without Distribution + +(1) You are permitted to use the Standard Version and create and use +Modified Versions for any purpose without restriction, provided that +you do not Distribute the Modified Version. + + +Permissions for Redistribution of the Standard Version + +(2) You may Distribute verbatim copies of the Source form of the +Standard Version of this Package in any medium without restriction, +either gratis or for a Distributor Fee, provided that you duplicate +all of the original copyright notices and associated disclaimers. At +your discretion, such verbatim copies may or may not include a +Compiled form of the Package. + +(3) You may apply any bug fixes, portability changes, and other +modifications made available from the Copyright Holder. The resulting +Package will still be considered the Standard Version, and as such +will be subject to the Original License. + + +Distribution of Modified Versions of the Package as Source + +(4) You may Distribute your Modified Version as Source (either gratis +or for a Distributor Fee, and with or without a Compiled form of the +Modified Version) provided that you clearly document how it differs +from the Standard Version, including, but not limited to, documenting +any non-standard features, executables, or modules, and provided that +you do at least ONE of the following: + + (a) make the Modified Version available to the Copyright Holder + of the Standard Version, under the Original License, so that the + Copyright Holder may include your modifications in the Standard + Version. + + (b) ensure that installation of your Modified Version does not + prevent the user installing or running the Standard Version. In + addition, the Modified Version must bear a name that is different + from the name of the Standard Version. + + (c) allow anyone who receives a copy of the Modified Version to + make the Source form of the Modified Version available to others + under + + (i) the Original License or + + (ii) a license that permits the licensee to freely copy, + modify and redistribute the Modified Version using the same + licensing terms that apply to the copy that the licensee + received, and requires that the Source form of the Modified + Version, and of any works derived from it, be made freely + available in that license fees are prohibited but Distributor + Fees are allowed. + + +Distribution of Compiled Forms of the Standard Version +or Modified Versions without the Source + +(5) You may Distribute Compiled forms of the Standard Version without +the Source, provided that you include complete instructions on how to +get the Source of the Standard Version. Such instructions must be +valid at the time of your distribution. If these instructions, at any +time while you are carrying out such distribution, become invalid, you +must provide new instructions on demand or cease further distribution. +If you provide valid instructions or cease distribution within thirty +days after you become aware that the instructions are invalid, then +you do not forfeit any of your rights under this license. + +(6) You may Distribute a Modified Version in Compiled form without +the Source, provided that you comply with Section 4 with respect to +the Source of the Modified Version. + + +Aggregating or Linking the Package + +(7) You may aggregate the Package (either the Standard Version or +Modified Version) with other packages and Distribute the resulting +aggregation provided that you do not charge a licensing fee for the +Package. Distributor Fees are permitted, and licensing fees for other +components in the aggregation are permitted. The terms of this license +apply to the use and Distribution of the Standard or Modified Versions +as included in the aggregation. + +(8) You are permitted to link Modified and Standard Versions with +other works, to embed the Package in a larger work of your own, or to +build stand-alone binary or bytecode versions of applications that +include the Package, and Distribute the result without restriction, +provided the result does not expose a direct interface to the Package. + + +Items That are Not Considered Part of a Modified Version + +(9) Works (including, but not limited to, modules and scripts) that +merely extend or make use of the Package, do not, by themselves, cause +the Package to be a Modified Version. In addition, such works are not +considered parts of the Package itself, and are not subject to the +terms of this license. + + +General Provisions + +(10) Any use, modification, and distribution of the Standard or +Modified Versions is governed by this Artistic License. By using, +modifying or distributing the Package, you accept this license. Do not +use, modify, or distribute the Package, if you do not accept this +license. + +(11) If your Modified Version has been derived from a Modified +Version made by someone other than you, you are nevertheless required +to ensure that your Modified Version complies with the requirements of +this license. + +(12) This license does not grant you the right to use any trademark, +service mark, tradename, or logo of the Copyright Holder. + +(13) This license includes the non-exclusive, worldwide, +free-of-charge patent license to make, have made, use, offer to sell, +sell, import and otherwise transfer the Package with respect to any +patent claims licensable by the Copyright Holder that are necessarily +infringed by the Package. If you institute patent litigation +(including a cross-claim or counterclaim) against any party alleging +that the Package constitutes direct or contributory patent +infringement, then this Artistic License to you shall terminate on the +date that such litigation is filed. + +(14) Disclaimer of Warranty: +THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS +IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR +NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL +LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/packaging/windows/cv2pdb.exe b/packaging/windows/cv2pdb.exe new file mode 100644 index 000000000..23d0a50c8 Binary files /dev/null and b/packaging/windows/cv2pdb.exe differ