From 23cb3e68221d1afedfc46c697d9265bee12a323c Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 4 May 2014 16:58:49 +0000 Subject: [PATCH] [CRT] * Sync __pxcptinfoptrs() with Wine 1.7.17. * Update __thread_data structure. CORE-8108 #resolve CORE-8080 svn path=/trunk/; revision=63157 --- reactos/lib/sdk/crt/include/internal/tls.h | 3 ++- reactos/lib/sdk/crt/signal/xcptinfo.c | 8 ++++---- reactos/media/doc/README.WINE | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/reactos/lib/sdk/crt/include/internal/tls.h b/reactos/lib/sdk/crt/include/internal/tls.h index 664e553ee39..c1b5eef03c9 100644 --- a/reactos/lib/sdk/crt/include/internal/tls.h +++ b/reactos/lib/sdk/crt/include/internal/tls.h @@ -39,7 +39,8 @@ struct __thread_data { struct tm *time_buffer; /* buffer for localtime/gmtime */ char *efcvt_buffer; /* buffer for ecvt/fcvt */ int unk3[2]; - void *unk4[4]; + void *unk4[3]; + EXCEPTION_POINTERS *xcptinfo; int fpecode; struct MSVCRT_threadmbcinfostruct *mbcinfo; struct MSVCRT_threadlocaleinfostruct *locinfo; diff --git a/reactos/lib/sdk/crt/signal/xcptinfo.c b/reactos/lib/sdk/crt/signal/xcptinfo.c index 0d14df09afb..a476d9c41ce 100644 --- a/reactos/lib/sdk/crt/signal/xcptinfo.c +++ b/reactos/lib/sdk/crt/signal/xcptinfo.c @@ -1,9 +1,9 @@ -#include +#include /* - * @unimplemented + * @implemented */ -void **__pxcptinfoptrs (void) +void** __pxcptinfoptrs(void) { - return NULL; + return (void**)&msvcrt_get_thread_data()->xcptinfo; } diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 5010d91db1d..7ad0d187f17 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -275,6 +275,7 @@ kernel32 - msvcrt - reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 + reactos/lib/sdk/crt/signal/xcptinfo.c # Synced to Wine-1.7.1 reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1_1_27 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529