Merge from amd64-branch:

44467, 44468, 44470, 44471, 46524
[OLDNAMES]
Update moldname-msvcrt.def
Add a proper oldnames lib, instead of implicitly including it with mingw.

46526
[FTP/DHCP]
- remove the oldnames hack, as we now have a proper oldnames lib (included in mingw_common)
- protect struct timezone from redefinition

svn path=/trunk/; revision=46592

reactos/ReactOS-amd64.rbuild

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
+<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude" allowwarnings="true">
 	<xi:include href="config-amd64.rbuild">
 		<xi:fallback>
 			<xi:include href="config-amd64.template.rbuild" />
@@ -28,12 +28,14 @@
 			<compilerflag>-ftracer</compilerflag>
 			<compilerflag>-momit-leaf-frame-pointer</compilerflag>
 		</if>
+		<compilerflag>-fms-extensions</compilerflag>
 		<compilerflag>-mpreferred-stack-boundary=4</compilerflag>
 		<compilerflag compiler="midl">-m64 --win64</compilerflag>
 		<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
 		<!-- compilerflag compiler="as">-gstabs+</compilerflag -->
 		<compilerflag>-U_X86_</compilerflag>
 		<compilerflag>-Wno-format</compilerflag>
+		<compilerflag>-fno-leading-underscore</compilerflag>
 	</group>
 
 	<group linkerset="ld">

reactos/base/applications/network/ftp/fake.h

@@ -9,9 +9,12 @@
 #define strcasecmp _stricmp
 #define strncasecmp _strnicmp
 
+#ifndef _TIMEZONE_DEFINED /* also in sys/time.h */
+#define _TIMEZONE_DEFINED
 struct timezone {
-    int tz_minuteswest; /* minutes W of Greenwich */
+  int tz_minuteswest;
-    int tz_dsttime;     /* type of dst correction */
+  int tz_dsttime;
 };
 
-int gettimeofday(struct timeval *tv, struct timezone *tz);
+  extern int __cdecl gettimeofday (struct timeval *p, struct timezone *z);
+#endif

reactos/base/applications/network/ftp/ftp.rbuild

@@ -4,19 +4,9 @@
 	<include base="ftp">.</include>
 	<define name="lint" />
 
-	<!-- FIXME: workarounds until we have a proper oldnames library -->
-	<define name="chdir">_chdir</define>
-	<define name="getcwd">_getcwd</define>
-	<define name="mktemp">_mktemp</define>
-	<define name="unlink">_unlink</define>
-	<define name="close">_close</define>
-	<define name="fileno">_fileno</define>
-	<define name="read">_read</define>
-	<define name="write">_write</define>
-	<define name="lseek">_lseek</define>
-
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
+	<library>oldnames</library>
 	<file>cmds.c</file>
 	<file>cmdtab.c</file>
 	<file>domacro.c</file>

reactos/base/services/dhcp/dhcp.rbuild

@@ -4,16 +4,11 @@
 	<include base="dhcp">.</include>
 	<include base="dhcp">include</include>
 
-	<!-- FIXME: workarounds until we have a proper oldnames library -->
-	<define name="tzset">_tzset</define>
-	<define name="close">_close</define>
-	<define name="read">_read</define>
-	<define name="write">_write</define>
-
 	<library>ntdll</library>
 	<library>ws2_32</library>
 	<library>iphlpapi</library>
 	<library>advapi32</library>
+	<library>oldnames</library>
 	<file>adapter.c</file>
 	<file>alloc.c</file>
 	<file>api.c</file>

reactos/lib/3rdparty/mingw/mingw.rbuild

@@ -3,8 +3,12 @@
 <group>
 <module name="mingw_common" type="staticlibrary" isstartuplib="true" crt="dll">
 	<define name="_CRTBLD" />
+
+	<!-- This is to prevent from using data imports directly -->
+	<define name="_M_CEE_PURE" />
+
 	<include base="ReactOS">include/reactos/mingw-w64</include>
-	<library>kernel32</library>
+		<library>kernel32</library>
 	<file>_newmode.c</file>
 	<file>atonexit.c</file>
 	<file>charmax.c</file>
@@ -50,4 +54,8 @@
 	<file>crtdll.c</file>
 	<file>dllargv.c</file>
 </module>
+<module name="oldnames" type="staticlibrary">
+	<define name="_CRTBLD" />
+	<importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" />
+</module>
 </group>

reactos/lib/3rdparty/mingw/moldname-msvcrt.def

@@ -1,118 +1,121 @@
+LIBRARY msvcrt.dll
+
 EXPORTS
-access
+access==_access
-chdir
+chdir==_chdir
-chmod
+chmod==_chmod
-chsize
+chsize==_chsize
-close
+close==_close
-creat
+creat==_creat
-cwait
+cwait==_cwait
-daylight DATA
+daylight==_daylight
-dup
+dup==_dup
-dup2
+dup2==_dup2
-ecvt
+ecvt==_ecvt
-eof
+eof==_eof
-execl
+execl==_execl
-execle
+execle==_execle
-execlp
+execlp==_execlp
-execlpe
+execlpe==_execlpe
-execv
+execv==_execv
-execve
+execve==_execve
-execvp
+execvp==_execvp
-execvpe
+execvpe==_execvpe
-fcvt
+fcvt==_fcvt
-fdopen
+fdopen==_fdopen
-fgetchar
+fgetchar==_fgetchar
-fgetwchar
+fgetwchar==_fgetwchar
-filelength
+filelength==_filelength
-fileno
+fileno==_fileno
-; fpreset
+fpreset==_fpreset
-fputchar
+fputchar==_fputchar
-fputwchar
+fputwchar==_fputwchar
-;fstat
+fstat==_fstat
-ftime
+ftime==_ftime
-gcvt
+gcvt==_gcvt
-getch
+getch==_getch
-getche
+getche==_getche
-getcwd
+getcwd==_getcwd
-getpid
+getpid==_getpid
-getw
+getw==_getw
-heapwalk
+heapwalk==_heapwalk
-isatty
+isatty==_isatty
-itoa
+itoa==_itoa
-kbhit
+kbhit==_kbhit
-lfind
+lfind==_lfind
-lsearch
+lsearch==_lsearch
-lseek
+lseek==_lseek
-ltoa
+ltoa==_ltoa
-memccpy
+memccpy==_memccpy
-memicmp
+memicmp==_memicmp
-mkdir
+mkdir==_mkdir
-mktemp
+mktemp==_mktemp
-open
+open==_open
-pclose
+pclose==_pclose
-popen
+popen==_popen
-putch
+putch==_putch
-putenv
+putenv==_putenv
-putw
+putw==_putw
-read
+read==_read
-rmdir
+rmdir==_rmdir
-rmtmp
+rmtmp==_rmtmp
-searchenv
+searchenv==_searchenv
-setmode
+setmode==_setmode
-sopen
+snprintf=_snprintf
-spawnl
+sopen==_sopen
-spawnle
+spawnl==_spawnl
-spawnlp
+spawnle==_spawnle
-spawnlpe
+spawnlp==_spawnlp
-spawnv
+spawnlpe==_spawnlpe
-spawnve
+spawnv==_spawnv
-spawnvp
+spawnve==_spawnve
-spawnvpe
+spawnvp==_spawnvp
-;stat
+spawnvpe==_spawnvpe
-strcmpi
+stat==_stat
-strdup
+strcmpi==_strcmpi
-stricmp
+strdup==_strdup
-stricoll
+stricmp==_stricmp
-strlwr
+stricoll==_stricoll
-strnicmp
+strlwr==_strlwr
-strnset
+strnicmp==_strnicmp
-strrev
+strnset==_strnset
-strset
+strrev==_strrev
-strupr
+strset==_strset
-swab
+strupr==_strupr
-tell
+swab==_swab
-tempnam
+tell==_tell
-timezone DATA
+tempnam==_tempnam
-tzname DATA
+timezone==_timezone
-tzset
+tzname==_tzname
-umask
+tzset==_tzset
-ungetch
+umask==_umask
-unlink
+ungetch==_ungetch
-utime
+unlink==_unlink
-wcsdup
+utime==_utime
-wcsicmp
+wcsdup==_wcsdup
-wcsicoll
+wcsicmp==_wcsicmp
-wcslwr
+wcsicoll==_wcsicoll
-wcsnicmp
+wcslwr==_wcslwr
-wcsnset
+wcsnicmp==_wcsnicmp
-wcsrev
+wcsnset==_wcsnset
-wcsset
+wcsrev==_wcsrev
-wcsupr
+wcsset==_wcsset
-wpopen
+wcsupr==_wcsupr
-write
+wpopen==_wpopen
+write==_write
 ; non-ANSI functions declared in math.h
-j0
+j0==_j0
-j1
+j1==_j1
-jn
+jn==_jn
-y0
+y0==_y0
-y1
+y1==_y1
-yn
+yn==_yn
-chgsign
+chgsign==_chgsign
-;scalb
+scalb==_scalb
-finite
+finite==_finite
-fpclass
+fpclass==_fpclass
 ; C99 functions
-cabs
+cabs==_cabs
-hypot
+hypot==_hypot
-logb
+logb==_logb
-nextafter
+nextafter==_nextafter