Author: akhaldi
Date: Sun May 4 16:58:49 2014
New Revision: 63157
URL:
http://svn.reactos.org/svn/reactos?rev=63157&view=rev
Log:
[CRT]
* Sync __pxcptinfoptrs() with Wine 1.7.17.
* Update __thread_data structure.
CORE-8108 #resolve
CORE-8080
Modified:
trunk/reactos/lib/sdk/crt/include/internal/tls.h
trunk/reactos/lib/sdk/crt/signal/xcptinfo.c
trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/lib/sdk/crt/include/internal/tls.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern…
==============================================================================
--- trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/include/internal/tls.h [iso-8859-1] Sun May 4 16:58:49
2014
@@ -39,7 +39,8 @@
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;
Modified: trunk/reactos/lib/sdk/crt/signal/xcptinfo.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/signal/xcptinf…
==============================================================================
--- trunk/reactos/lib/sdk/crt/signal/xcptinfo.c [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/signal/xcptinfo.c [iso-8859-1] Sun May 4 16:58:49 2014
@@ -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;
}
Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun May 4 16:58:49 2014
@@ -275,6 +275,7 @@
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