From af3b7ffad5534f20e6edb4f17d83fd54caae6004 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 3 Sep 2016 13:23:43 +0000
Subject: [PATCH] [CRT] Apply Wine commit 21fd1d3 by Nikolay Sivov: Fix
 calloc() prototype. CORE-11866

svn path=/trunk/; revision=72544
---
 reactos/sdk/lib/crt/stdio/file.c    | 4 ++--
 reactos/sdk/lib/crt/stdlib/atexit.c | 2 +-
 reactos/sdk/lib/crt/wine/heap.c     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/sdk/lib/crt/stdio/file.c b/reactos/sdk/lib/crt/stdio/file.c
index a9b2e67cbc5..43f56066a89 100644
--- a/reactos/sdk/lib/crt/stdio/file.c
+++ b/reactos/sdk/lib/crt/stdio/file.c
@@ -410,7 +410,7 @@ unsigned create_io_inherit_block(WORD *size, BYTE **block)
   ioinfo*     fdinfo;
 
   *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * fdend;
-  *block = calloc(*size, 1);
+  *block = calloc(1, *size);
   if (!*block)
   {
     *size = 0;
@@ -547,7 +547,7 @@ int CDECL _isatty(int fd)
             && _isatty(file->_file))
         return FALSE;
 
-    file->_base = calloc(MSVCRT_INTERNAL_BUFSIZ,1);
+    file->_base = calloc(1, MSVCRT_INTERNAL_BUFSIZ);
     if(file->_base) {
         file->_bufsiz = MSVCRT_INTERNAL_BUFSIZ;
         file->_flag |= _IOMYBUF;
diff --git a/reactos/sdk/lib/crt/stdlib/atexit.c b/reactos/sdk/lib/crt/stdlib/atexit.c
index 6e52c66cf49..6ab8942b333 100644
--- a/reactos/sdk/lib/crt/stdlib/atexit.c
+++ b/reactos/sdk/lib/crt/stdlib/atexit.c
@@ -69,7 +69,7 @@ _onexit_t CDECL _onexit(_onexit_t func)
   {
     _onexit_t *newtable;
     TRACE("expanding table\n");
-    newtable = calloc(sizeof(void *),atexit_table_size + 32);
+    newtable = calloc(atexit_table_size + 32, sizeof(void *));
     if (!newtable)
     {
       TRACE("failed!\n");
diff --git a/reactos/sdk/lib/crt/wine/heap.c b/reactos/sdk/lib/crt/wine/heap.c
index 8ee2d1b433f..3716fe52c39 100644
--- a/reactos/sdk/lib/crt/wine/heap.c
+++ b/reactos/sdk/lib/crt/wine/heap.c
@@ -288,9 +288,9 @@ size_t CDECL _msize(void* mem)
 /*********************************************************************
  *		calloc (MSVCRT.@)
  */
-void* CDECL calloc(size_t size, size_t count)
+void* CDECL calloc(size_t count, size_t size)
 {
-  return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size * count );
+  return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, count * size );
 }
 
 /*********************************************************************