From 7f1e74a97ac92f84fcbc22f3bc986bd850af4448 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 21 Jun 2002 21:53:05 +0000
Subject: [PATCH] getmainargs: new_mode argument is not a pointer in msvcrt20
 (spotted by Bill Medland).

---
 dlls/msvcrt20/Makefile.in   |  2 +-
 dlls/msvcrt20/dummy.c       |  3 ---
 dlls/msvcrt20/msvcrt20.c    | 48 +++++++++++++++++++++++++++++++++++++
 dlls/msvcrt20/msvcrt20.spec |  4 ++--
 4 files changed, 51 insertions(+), 6 deletions(-)
 delete mode 100644 dlls/msvcrt20/dummy.c
 create mode 100644 dlls/msvcrt20/msvcrt20.c

diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in
index dbd02d1dc30..472c06b134a 100644
--- a/dlls/msvcrt20/Makefile.in
+++ b/dlls/msvcrt20/Makefile.in
@@ -10,7 +10,7 @@ EXTRALIBS = $(LIBUNICODE)
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o
 
-C_SRCS = dummy.c
+C_SRCS = msvcrt20.c
 
 @MAKE_DLL_RULES@
 
diff --git a/dlls/msvcrt20/dummy.c b/dlls/msvcrt20/dummy.c
deleted file mode 100644
index c53c5840500..00000000000
--- a/dlls/msvcrt20/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- * Dummy file
- */
diff --git a/dlls/msvcrt20/msvcrt20.c b/dlls/msvcrt20/msvcrt20.c
new file mode 100644
index 00000000000..cd30f0ca040
--- /dev/null
+++ b/dlls/msvcrt20/msvcrt20.c
@@ -0,0 +1,48 @@
+/*
+ * msvcrt20 implementation
+ *
+ * Copyright 2002 Alexandre Julliard
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "windef.h"
+
+extern void __getmainargs(int *argc, char** *argv, char** *envp,
+                          int expand_wildcards, int *new_mode);
+extern void __wgetmainargs(int *argc, WCHAR** *wargv, WCHAR** *wenvp,
+                           int expand_wildcards, int *new_mode);
+
+/*********************************************************************
+ *		__getmainargs (MSVCRT20.@)
+ *
+ * new_mode is not a pointer in msvcrt20.
+ */
+void MSVCRT20__getmainargs( int *argc, char** *argv, char** *envp,
+                            int expand_wildcards, int new_mode )
+{
+    __getmainargs( argc, argv, envp, expand_wildcards, &new_mode );
+}
+
+/*********************************************************************
+ *		__wgetmainargs (MSVCRT20.@)
+ *
+ * new_mode is not a pointer in msvcrt20.
+ */
+void MSVCRT20__wgetmainargs( int *argc, WCHAR** *wargv, WCHAR** *wenvp,
+                             int expand_wildcards, int new_mode )
+{
+    __wgetmainargs( argc, wargv, wenvp, expand_wildcards, &new_mode );
+}
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index d50073a8666..c8bada084a9 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -464,7 +464,7 @@
 @ forward -noimport __dllonexit msvcrt.__dllonexit
 @ forward -noimport __doserrno msvcrt.__doserrno
 @ forward -noimport __fpecode msvcrt.__fpecode
-@ forward -noimport __getmainargs msvcrt.__getmainargs
+@ cdecl -noimport __getmainargs(ptr ptr ptr long long) MSVCRT20__getmainargs
 @ forward -noimport __initenv msvcrt.__initenv
 @ forward -noimport __isascii msvcrt.__isascii
 @ forward -noimport __iscsym msvcrt.__iscsym
@@ -502,7 +502,7 @@
 @ forward -noimport __threadid msvcrt.__threadid
 @ forward -noimport __toascii msvcrt.__toascii
 @ forward -noimport __wargv msvcrt.__wargv
-@ forward -noimport __wgetmainargs msvcrt.__wgetmainargs
+@ cdecl -noimport __wgetmainargs(ptr ptr ptr long long) MSVCRT20__wgetmainargs
 @ forward -noimport __winitenv msvcrt.__winitenv
 @ forward -noimport _abnormal_termination msvcrt._abnormal_termination
 @ forward -noimport _access msvcrt._access