[CRT]
authorAmine Khaldi <amine.khaldi@reactos.org>
Sun, 4 May 2014 16:58:49 +0000 (16:58 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sun, 4 May 2014 16:58:49 +0000 (16:58 +0000)
* 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
reactos/lib/sdk/crt/signal/xcptinfo.c
reactos/media/doc/README.WINE

index 664e553..c1b5eef 100644 (file)
@@ -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;
index 0d14df0..a476d9c 100644 (file)
@@ -1,9 +1,9 @@
-#include <stdlib.h>
+#include <precomp.h>
 
 /*
- * @unimplemented
+ * @implemented
  */
-void **__pxcptinfoptrs (void)
+void** __pxcptinfoptrs(void)
 {
-        return NULL;
+    return (void**)&msvcrt_get_thread_data()->xcptinfo;
 }
index 5010d91..7ad0d18 100644 (file)
@@ -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