[PATCH 6/7] msvcrt: Call invalid parameter handler for out-of-range integer.

Jeff Smith whydoubt at gmail.com
Thu Nov 21 18:28:11 CST 2019


Signed-off-by: Jeff Smith <whydoubt at gmail.com>
---
 dlls/msvcrt/time.c         | 2 +-
 dlls/ucrtbase/tests/misc.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 84e725747f..ec8f45d140 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -998,7 +998,7 @@ static inline BOOL strftime_int(STRFTIME_CHAR *str, MSVCRT_size_t *pos, MSVCRT_s
 
     if(src<l || src>h) {
         *str = 0;
-        *MSVCRT__errno() = MSVCRT_EINVAL;
+        MSVCRT_INVALID_PMT("Invalid value", MSVCRT_EINVAL);
         return FALSE;
     }
 
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index 93a78a5de7..6314662eac 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -937,10 +937,10 @@ static void test_strftime(void)
         {"%C", "19", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%C", "99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }},
         {"%C", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }},
-        {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%d", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }},
         {"%d", "01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%d", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }},
-        {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%d", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }},
         {"%D", "", { 0, 0, 0, 1, 0, -1901, 4, 0, 0 }},
         {"%D", "01/01/00", { 0, 0, 0, 1, 0, -1900, 4, 0, 0 }},
         {"%D", "01/01/99", { 0, 0, 0, 1, 0, -1, 4, 0, 0 }},
@@ -948,10 +948,10 @@ static void test_strftime(void)
         {"%D", "01/01/99", { 0, 0, 0, 1, 0, 8099, 4, 0, 0 }},
         {"%D", "", { 0, 0, 0, 1, 0, 8100, 4, 0, 0 }},
         {"%#D", "1/1/70", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
-        {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%e", "", { 0, 0, 0, 0, 0, 70, 4, 0, 0 }},
         {"%e", " 1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%e", "31", { 0, 0, 0, 31, 0, 70, 4, 0, 0 }},
-        {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }, FALSE, TRUE},
+        {"%e", "", { 0, 0, 0, 32, 0, 70, 4, 0, 0 }},
         {"%#e", "1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%F", "1970-01-01", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
         {"%#F", "1970-1-1", { 0, 0, 0, 1, 0, 70, 4, 0, 0 }},
-- 
2.23.0




More information about the wine-devel mailing list