diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
index 4921883e05c..853a43fb23a 100644
--- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
+++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec
@@ -140,7 +140,7 @@
 @ cdecl getc(ptr) ucrtbase.getc
 @ cdecl getchar() ucrtbase.getchar
 @ cdecl gets(str) ucrtbase.gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) ucrtbase.gets_s
 @ cdecl getwc(ptr) ucrtbase.getwc
 @ cdecl getwchar() ucrtbase.getwchar
 @ cdecl putc(long ptr) ucrtbase.putc
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 44269879364..88698ca5c30 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -1700,7 +1700,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 35726644434..3d116c4ec84 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -2058,7 +2058,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index b7d644a1d97..f317d1f8b3e 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -2204,7 +2204,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ stub ilogb
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 2d096fcf6b7..0f5d1430896 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1868,7 +1868,7 @@
 @ cdecl getc(ptr) msvcr120.getc
 @ cdecl getchar() msvcr120.getchar
 @ cdecl gets(str) msvcr120.gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) msvcr120.gets_s
 @ cdecl getwc(ptr) msvcr120.getwc
 @ cdecl getwchar() msvcr120.getwchar
 @ stub ilogb
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 0df1f0adb75..b563427dade 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -1382,7 +1382,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 72381630cd5..a73500509a4 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -1355,7 +1355,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) ntdll.iswctype
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 1c7b5a4d827..2c05f25c6a0 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -4719,31 +4719,53 @@ int CDECL MSVCRT_getc(MSVCRT_FILE* file)
 }
 
 /*********************************************************************
- *		gets (MSVCRT.@)
+ *		gets_s (MSVCR80.@)
+ */
+char * CDECL MSVCRT_gets_s(char *buf, MSVCRT_size_t len)
+{
+    char *buf_start = buf;
+    int cc;
+
+    if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL;
+    if (!MSVCRT_CHECK_PMT(len != 0)) return NULL;
+
+    MSVCRT__lock_file(MSVCRT_stdin);
+    for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin);
+            len != 0 && cc != MSVCRT_EOF && cc != '\n';
+            cc = MSVCRT__fgetc_nolock(MSVCRT_stdin))
+    {
+        if (cc != '\r')
+        {
+            *buf++ = (char)cc;
+            len--;
+        }
+    }
+    MSVCRT__unlock_file(MSVCRT_stdin);
+
+    if (!len)
+    {
+        *buf_start = 0;
+        MSVCRT__invalid_parameter(NULL, NULL, NULL, 0, 0);
+        return NULL;
+    }
+
+    if ((cc == MSVCRT_EOF) && (buf_start == buf))
+    {
+        TRACE(":nothing read\n");
+        return NULL;
+    }
+    *buf = '\0';
+
+    TRACE("got '%s'\n", buf_start);
+    return buf_start;
+}
+
+/*********************************************************************
+ *              gets (MSVCRT.@)
  */
 char * CDECL MSVCRT_gets(char *buf)
 {
-  int    cc;
-  char * buf_start = buf;
-
-  MSVCRT__lock_file(MSVCRT_stdin);
-  for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin); cc != MSVCRT_EOF && cc != '\n';
-          cc = MSVCRT__fgetc_nolock(MSVCRT_stdin))
-  {
-      if(cc != '\r')
-          *buf++ = (char)cc;
-  }
-  MSVCRT__unlock_file(MSVCRT_stdin);
-
-  if ((cc == MSVCRT_EOF) && (buf_start == buf))
-  {
-    TRACE(":nothing read\n");
-    return NULL;
-  }
-  *buf = '\0';
-
-  TRACE("got '%s'\n", buf_start);
-  return buf_start;
+    return MSVCRT_gets_s(buf, -1);
 }
 
 /*********************************************************************
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 63046636005..1ced9cafd24 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -2337,7 +2337,7 @@
 @ cdecl getenv(str) MSVCRT_getenv
 @ cdecl getenv_s(ptr ptr long str)
 @ cdecl gets(str) MSVCRT_gets
-@ stub gets_s
+@ cdecl gets_s(ptr long) MSVCRT_gets_s
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl hypot(double double) _hypot