jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2835 from RytoEX/crash-log-win-release-id 

libobs: Add Windows 10 release version to crash log
master
Jim 2020-05-03 06:31:29 -07:00 committed by GitHub
parent eb44e05169 b7f1bf9bc4
commit d5d36b2f7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libobs/obs-win-crash-handler.c
View File

@ -246,6 +246,8 @@ static inline void init_module_info(struct exception_handler_data *data)
data); data);
} }
extern const char *get_win_release_id();
static inline void write_header(struct exception_handler_data *data) static inline void write_header(struct exception_handler_data *data)
{ {
char date_time[80]; char date_time[80];
@ -260,18 +262,20 @@ static inline void write_header(struct exception_handler_data *data)
else else
obs_bitness = "32"; obs_bitness = "32";
const char *release_id = get_win_release_id();
dstr_catf(&data->str, dstr_catf(&data->str,
"Unhandled exception: %x\r\n" "Unhandled exception: %x\r\n"
"Date/Time: %s\r\n" "Date/Time: %s\r\n"
"Fault address: %" PRIX64 " (%s)\r\n" "Fault address: %" PRIX64 " (%s)\r\n"
"libobs version: " OBS_VERSION " (%s-bit)\r\n" "libobs version: " OBS_VERSION " (%s-bit)\r\n"
"Windows version: %d.%d build %d (revision: %d; " "Windows version: %d.%d build %d (release: %s; revision: %d; "
"%s-bit)\r\n" "%s-bit)\r\n"
"CPU: %s\r\n\r\n", "CPU: %s\r\n\r\n",
data->exception->ExceptionRecord->ExceptionCode, date_time, data->exception->ExceptionRecord->ExceptionCode, date_time,
data->main_trace.instruction_ptr, data->module_name.array, data->main_trace.instruction_ptr, data->module_name.array,
obs_bitness, data->win_version.major, data->win_version.minor, obs_bitness, data->win_version.major, data->win_version.minor,
data->win_version.build, data->win_version.revis, data->win_version.build, release_id, data->win_version.revis,
is_64_bit_windows() ? "64" : "32", data->cpu_info.array); is_64_bit_windows() ? "64" : "32", data->cpu_info.array);
} }