* Sync up to trunk head (r64921).

[reactos.git] / lib / sdk / crt / stdlib / errno.c

diff --git a/lib/sdk/crt/stdlib/errno.c b/lib/sdk/crt/stdlib/errno.c
index a56c0dd..f1b06e9 100644 (file)
--- a/lib/sdk/crt/stdlib/errno.c
+++ b/lib/sdk/crt/stdlib/errno.c
@@ -13,61 +13,61 @@
 
 static _invalid_parameter_handler invalid_parameter_handler = NULL;
 
-/*
- * @implemented
+/*********************************************************************
+ *             _errno (MSVCRT.@)
  */
-unsigned long* CDECL __doserrno(void)
+int CDECL *_errno(void)
 {
-    return &(msvcrt_get_thread_data()->thread_doserrno);
+    return &(msvcrt_get_thread_data()->thread_errno);
 }
 
-/*
- * @implemented
+/*********************************************************************
+ *             __doserrno (MSVCRT.@)
  */
-int CDECL *_errno(void)
+unsigned long* CDECL __doserrno(void)
 {
-    return &(msvcrt_get_thread_data()->thread_errno);
+    return &(msvcrt_get_thread_data()->thread_doserrno);
 }
 
-/*
- * @implemented
+/*********************************************************************
+ *             _get_errno (MSVCRT.@)
  */
-errno_t CDECL _get_doserrno(unsigned long *pValue)
+errno_t CDECL _get_errno(int *pValue)
 {
     if (!pValue)
         return EINVAL;
 
-    *pValue = *__doserrno();
+    *pValue = *_errno();
     return 0;
 }
 
-/*
- * @implemented
+/*********************************************************************
+ *             _get_doserrno (MSVCRT.@)
  */
-errno_t CDECL _set_doserrno(unsigned long error)
+errno_t CDECL _get_doserrno(unsigned long *pValue)
 {
-    *__doserrno() = error;
+    if (!pValue)
+        return EINVAL;
+
+    *pValue = *__doserrno();
     return 0;
 }
 
-/*
- * @implemented
+/*********************************************************************
+ *             _set_errno (MSVCRT.@)
  */
-errno_t CDECL _get_errno(int *pValue)
+errno_t CDECL _set_errno(int value)
 {
-    if (!pValue)
-        return EINVAL;
-
-    *pValue = *_errno();
+    *_errno() = value;
     return 0;
 }
 
-/*
- * @implemented
+/*********************************************************************
+ *             _set_doserrno (MSVCRT.@)
  */
-int CDECL _set_errno(int error)
+errno_t CDECL _set_doserrno(unsigned long value)
 {
-    *_errno() = error;
+    *__doserrno() = value;
     return 0;
 }
 
@@ -124,8 +124,8 @@ int CDECL _set_error_mode(int mode)
 }
 
 /******************************************************************************
-*              _seterrormode (MSVCRT.@)
-*/
+ *             _seterrormode (MSVCRT.@)
+ */
 void CDECL _seterrormode(int mode)
 {
     SetErrorMode( mode );
@@ -134,14 +134,16 @@ void CDECL _seterrormode(int mode)
 /******************************************************************************
  *             _invalid_parameter (MSVCRT.@)
  */
-void CDECL _invalid_parameter(const wchar_t *expr, const wchar_t *func,
-                                       const wchar_t *file, unsigned int line, uintptr_t arg)
+void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func,
+                                const wchar_t *file, unsigned int line, uintptr_t arg)
 {
     if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg );
     else
     {
         ERR( "%s:%u %s: %s %lx\n", debugstr_w(file), line, debugstr_w(func), debugstr_w(expr), arg );
+#if _MSVCR_VER > 0 // FIXME: possible improvement: use a global variable in the DLL
         RaiseException( STATUS_INVALID_CRUNTIME_PARAMETER, EXCEPTION_NONCONTINUABLE, 0, NULL );
+#endif
     }
 }
 
@@ -163,4 +165,3 @@ _invalid_parameter_handler CDECL _set_invalid_parameter_handler(
     invalid_parameter_handler = handler;
     return old;
 }
-/* EOF */