Andrew Nguyen : msvcrt: Implement _set_doserrno.

Alexandre Julliard julliard at winehq.org
Tue Sep 28 11:13:34 CDT 2010


Module: wine
Branch: master
Commit: 67088eb34c9ed44eed4be437c83c5af45c4ae309
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=67088eb34c9ed44eed4be437c83c5af45c4ae309

Author: Andrew Nguyen <anguyen at codeweavers.com>
Date:   Tue Sep 28 03:49:03 2010 -0500

msvcrt: Implement _set_doserrno.

---

 dlls/msvcr100/msvcr100.spec |    2 +-
 dlls/msvcr80/msvcr80.spec   |    2 +-
 dlls/msvcr90/msvcr90.spec   |    2 +-
 dlls/msvcrt/errno.c         |    9 +++++++++
 dlls/msvcrt/msvcrt.spec     |    2 +-
 dlls/msvcrt/tests/misc.c    |   32 ++++++++++++++++++++++++++++++++
 include/msvcrt/stdlib.h     |    1 +
 7 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 4c44402..7b8be69 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1070,7 +1070,7 @@
 @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable
 @ stub _set_abort_behavior
 @ stub _set_controlfp
-@ stub _set_doserrno
+@ cdecl _set_doserrno(long) msvcrt._set_doserrno
 @ cdecl _set_errno(long) msvcrt._set_errno
 @ cdecl _set_error_mode(long) msvcrt._set_error_mode
 @ stub _set_fmode
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 3703af5..27c4088 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -923,7 +923,7 @@
 @ stub _set_abort_behavior
 @ stub _set_amblksiz
 @ stub _set_controlfp
-@ stub _set_doserrno
+@ cdecl _set_doserrno(long) msvcrt._set_doserrno
 @ cdecl _set_errno(long) msvcrt._set_errno
 @ cdecl _set_error_mode(long) msvcrt._set_error_mode
 @ stub _set_fmode
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 78ff662..00ccade 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -909,7 +909,7 @@
 @ stub _set_abort_behavior
 @ stub _set_amblksiz
 @ stub _set_controlfp
-@ stub _set_doserrno
+@ cdecl _set_doserrno(long) msvcrt._set_doserrno
 @ cdecl _set_errno(long) msvcrt._set_errno
 @ cdecl _set_error_mode(long) msvcrt._set_error_mode
 @ stub _set_fmode
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index 1c369af..266b6db 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -237,6 +237,15 @@ int CDECL _set_errno(int value)
 }
 
 /*********************************************************************
+ *		_set_doserrno (MSVCRT.@)
+ */
+int CDECL _set_doserrno(int value)
+{
+    *MSVCRT___doserrno() = value;
+    return 0;
+}
+
+/*********************************************************************
  *		strerror (MSVCRT.@)
  */
 char* CDECL MSVCRT_strerror(int err)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 8c2626d..5325227 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -848,7 +848,7 @@
 @ stdcall -i386 _seh_longjmp_unwind(ptr)
 @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable
 # stub _set_controlfp
-# stub _set_doserrno
+@ cdecl _set_doserrno(long)
 @ cdecl _set_errno(long)
 @ cdecl _set_error_mode(long)
 # stub _set_fileinfo
diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c
index 620f09e..a4a1bd3 100644
--- a/dlls/msvcrt/tests/misc.c
+++ b/dlls/msvcrt/tests/misc.c
@@ -28,6 +28,7 @@ static int (__cdecl *pI10_OUTPUT)(long double, int, int, void*);
 static int (__cdecl *pstrerror_s)(char *, MSVCRT_size_t, int);
 static int (__cdecl *p_get_doserrno)(int *);
 static int (__cdecl *p_get_errno)(int *);
+static int (__cdecl *p_set_doserrno)(int);
 static int (__cdecl *p_set_errno)(int);
 
 static void init(void)
@@ -40,6 +41,7 @@ static void init(void)
     pstrerror_s = (void *)GetProcAddress(hmod, "strerror_s");
     p_get_doserrno = (void *)GetProcAddress(hmod, "_get_doserrno");
     p_get_errno = (void *)GetProcAddress(hmod, "_get_errno");
+    p_set_doserrno = (void *)GetProcAddress(hmod, "_set_doserrno");
     p_set_errno = (void *)GetProcAddress(hmod, "_set_errno");
 }
 
@@ -294,6 +296,35 @@ static void test__get_errno(void)
     ok(out == EBADF, "Expected output variable to be EBADF, got %d\n", out);
 }
 
+static void test__set_doserrno(void)
+{
+    int ret;
+
+    if (!p_set_doserrno)
+    {
+        win_skip("_set_doserrno is not available\n");
+        return;
+    }
+
+    _doserrno = ERROR_INVALID_CMM;
+    ret = p_set_doserrno(ERROR_FILE_NOT_FOUND);
+    ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret);
+    ok(_doserrno == ERROR_FILE_NOT_FOUND,
+       "Expected _doserrno to be ERROR_FILE_NOT_FOUND, got %d\n", _doserrno);
+
+    _doserrno = ERROR_INVALID_CMM;
+    ret = p_set_doserrno(-1);
+    ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret);
+    ok(_doserrno == -1,
+       "Expected _doserrno to be -1, got %d\n", _doserrno);
+
+    _doserrno = ERROR_INVALID_CMM;
+    ret = p_set_doserrno(0xdeadbeef);
+    ok(ret == 0, "Expected _set_doserrno to return 0, got %d\n", ret);
+    ok(_doserrno == 0xdeadbeef,
+       "Expected _doserrno to be 0xdeadbeef, got %d\n", _doserrno);
+}
+
 static void test__set_errno(void)
 {
     int ret;
@@ -330,5 +361,6 @@ START_TEST(misc)
     test_strerror_s();
     test__get_doserrno();
     test__get_errno();
+    test__set_doserrno();
     test__set_errno();
 }
diff --git a/include/msvcrt/stdlib.h b/include/msvcrt/stdlib.h
index 1331ac5..bef83f4 100644
--- a/include/msvcrt/stdlib.h
+++ b/include/msvcrt/stdlib.h
@@ -130,6 +130,7 @@ extern int*           __cdecl _errno(void);
 
 errno_t       __cdecl _get_doserrno(int*);
 errno_t       __cdecl _get_errno(int*);
+errno_t       __cdecl _set_doserrno(int);
 errno_t       __cdecl _set_errno(int);
 
 typedef int (__cdecl *_onexit_t)(void);




More information about the wine-cvs mailing list